Fix #343
This commit is contained in:
parent
db3a8c3045
commit
962807f835
@ -517,7 +517,7 @@
|
||||
+ this.setPassengerOf(p_70078_1_);
|
||||
+ }
|
||||
+
|
||||
+ protected CraftEntity bukkitEntity;
|
||||
+ public CraftEntity bukkitEntity;
|
||||
+
|
||||
+ public CraftEntity getBukkitEntity()
|
||||
+ {
|
||||
|
@ -13,6 +13,7 @@ public enum ReverseClonner {
|
||||
public static EntityPlayerMP clone(EntityPlayerMP player, boolean wasDeath) {
|
||||
EntityPlayerMP shadowCopy = new EntityPlayerMP(player.mcServer, (WorldServer) player.worldObj,
|
||||
player.getGameProfile(), new ItemInWorldManager(player.worldObj));
|
||||
shadowCopy.bukkitEntity = player.bukkitEntity;
|
||||
shadowCopy.playerNetServerHandler = player.playerNetServerHandler;
|
||||
shadowCopy.clonePlayer(player, true);
|
||||
if (wasDeath && !player.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) {
|
||||
|
@ -25,6 +25,7 @@ public class TerminalConsoleWriterThread implements Runnable {
|
||||
message = QueueLogAppender.getNextLogEvent("TerminalConsole");
|
||||
if (message == null) {
|
||||
Thread.yield();
|
||||
continue;
|
||||
}
|
||||
|
||||
try {
|
||||
|
Loading…
Reference in New Issue
Block a user