xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Fix #343

Browse Source
This commit is contained in:
Sergey Shatunov 2016-02-07 14:40:26 +07:00
parent db3a8c3045
commit 962807f835
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/net/minecraft/entity/Entity.java.patch
View File

@ -517,7 +517,7 @@
+ this.setPassengerOf(p_70078_1_); + this.setPassengerOf(p_70078_1_);
+ } + }
+ +
+ protected CraftEntity bukkitEntity; + public CraftEntity bukkitEntity;
+ +
+ public CraftEntity getBukkitEntity() + public CraftEntity getBukkitEntity()
+ { + {

1
src/main/java/kcauldron/ReverseClonner.java
View File

@ -13,6 +13,7 @@ public enum ReverseClonner {
public static EntityPlayerMP clone(EntityPlayerMP player, boolean wasDeath) { public static EntityPlayerMP clone(EntityPlayerMP player, boolean wasDeath) {
EntityPlayerMP shadowCopy = new EntityPlayerMP(player.mcServer, (WorldServer) player.worldObj, EntityPlayerMP shadowCopy = new EntityPlayerMP(player.mcServer, (WorldServer) player.worldObj,
player.getGameProfile(), new ItemInWorldManager(player.worldObj)); player.getGameProfile(), new ItemInWorldManager(player.worldObj));
shadowCopy.bukkitEntity = player.bukkitEntity;
shadowCopy.playerNetServerHandler = player.playerNetServerHandler; shadowCopy.playerNetServerHandler = player.playerNetServerHandler;
shadowCopy.clonePlayer(player, true); shadowCopy.clonePlayer(player, true);
if (wasDeath && !player.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) { if (wasDeath && !player.worldObj.getGameRules().getGameRuleBooleanValue("keepInventory")) {

1
src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
View File

@ -25,6 +25,7 @@ public class TerminalConsoleWriterThread implements Runnable {
message = QueueLogAppender.getNextLogEvent("TerminalConsole"); message = QueueLogAppender.getNextLogEvent("TerminalConsole");
if (message == null) { if (message == null) {
Thread.yield(); Thread.yield();
continue;
} }
try { try {