From c87ec345a5fc6d45aad21e2d1b6a3db2b4ef15b1 Mon Sep 17 00:00:00 2001 From: Robotia Date: Tue, 26 Jan 2016 23:59:12 -0500 Subject: [PATCH] Revise PaperSpigot fixes to fit KC --- .../org/bukkit/craftbukkit/entity/CraftEntity.java | 2 +- .../bukkit/craftbukkit/inventory/CraftMetaSkull.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 6a2df21..202555a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -421,7 +421,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } // Spigot end entity.setPositionAndRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch()); - entity.world.entityJoinedWorld(entity, false); + //entity.worldObj.entityJoinedWorld(entity, false); // PaperSpigot - Prevent Server from thinking a player teleporting within the world has joined the world // entity.setLocation() throws no event, and so cannot be cancelled return true; } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java index 3abfc83..d8be4b8 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -13,7 +13,7 @@ import org.bukkit.craftbukkit.inventory.CraftMetaItem.SerializableMeta; import org.bukkit.inventory.meta.SkullMeta; // PaperSpigot start -import net.minecraft.server.EntityPlayer; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.server.MinecraftServer; // PaperSpigot end @@ -103,8 +103,14 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { profile = null; } else { // PaperSpigot - Check usercache if the player is online - EntityPlayer player = MinecraftServer.getServer().getPlayerList().getPlayer(name); - profile = player != null ? player.getProfile() : new GameProfile(null, name); + EntityPlayer player = null; + for(Object o : MinecraftServer.getServer().getConfigurationManager().playerEntityList) + { + if(!(o instanceof EntityPlayer)) { continue; } + EntityPlayer ep = (EntityPlayer)o; + if(ep.getCommandSenderName().equals(name)) { player = ep; break; } + } + profile = player != null ? player.getGameProfile() : new GameProfile(null, name); // PaperSpigot end }