From 962807f835e6ccaa7ebde661e19a91af6d6fb402 Mon Sep 17 00:00:00 2001
From: Sergey Shatunov <me@prok.pw>
Date: Sun, 7 Feb 2016 14:40:26 +0700
Subject: [PATCH] Fix #343

---
 patches/net/minecraft/entity/Entity.java.patch                  | 2 +-
 src/main/java/kcauldron/ReverseClonner.java                     | 1 +
 .../bukkit/craftbukkit/util/TerminalConsoleWriterThread.java    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/patches/net/minecraft/entity/Entity.java.patch b/patches/net/minecraft/entity/Entity.java.patch
index 113c3ed..01db7f5 100644
--- a/patches/net/minecraft/entity/Entity.java.patch
+++ b/patches/net/minecraft/entity/Entity.java.patch
@@ -517,7 +517,7 @@
 +        this.setPassengerOf(p_70078_1_);
 +    }
 +
-+    protected CraftEntity bukkitEntity;
++    public CraftEntity bukkitEntity;
 +
 +    public CraftEntity getBukkitEntity()
 +    {
diff --git a/src/main/java/kcauldron/ReverseClonner.java b/src/main/java/kcauldron/ReverseClonner.java
index f44eba8..9a63e2c 100644
--- a/src/main/java/kcauldron/ReverseClonner.java
+++ b/src/main/java/kcauldron/ReverseClonner.java
@@ -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")) {
diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
index a114665..981bb33 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
@@ -25,6 +25,7 @@ public class TerminalConsoleWriterThread implements Runnable {
             message = QueueLogAppender.getNextLogEvent("TerminalConsole");
             if (message == null) {
                 Thread.yield();
+                continue;
             }
 
             try {