mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix paper tab list API

Browse source
This commit is contained in:
Shane Freeder 2018-09-01 11:09:13 +01:00
parent 449efb5d63
commit 4a3222542d
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
13 changed files with 91 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Spigot-Server-Patches/0003-MC-Dev-fixes.patch
View file

@ -1,4 +1,4 @@
From a745d7718cedae36f6ec9cd4222da6e69e754ae1 Mon Sep 17 00:00:00 2001
From 8bde0c87a214ab11f4cded62f33cd91d56234781 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 30 Mar 2016 19:36:20 -0400
Subject: [PATCH] MC Dev fixes
@ -249,6 +249,25 @@ index 38c85f4ab7..c0853f0fcd 100644
return this.a((EnumDirection)object);
}
}
diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
index 3f5d6c3239..286c1b14f6 100644
--- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
+++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
@@ -390,12 +390,12 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
}
// $FF: synthetic method
- public JsonElement serialize(Object object, Type type, JsonSerializationContext jsonserializationcontext) {
+ public JsonElement serialize(IChatBaseComponent object, Type type, JsonSerializationContext jsonserializationcontext) { // Paper - decompile fix
return this.a((IChatBaseComponent)object, type, jsonserializationcontext);
}
// $FF: synthetic method
- public Object deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException {
+ public IChatBaseComponent deserialize(JsonElement jsonelement, Type type, JsonDeserializationContext jsondeserializationcontext) throws JsonParseException { // Paper - decompile fix
return this.a(jsonelement, type, jsondeserializationcontext);
}
}
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
index 0c9249cd8d..0648c76a07 100644
--- a/src/main/java/net/minecraft/server/LocaleLanguage.java

35
Spigot-Server-Patches/0051-Player-Tab-List-and-Title-APIs.patch
View file

@ -1,9 +1,21 @@
From 912940219423c9a3d0ceacbc4d7628285dcd35f4 Mon Sep 17 00:00:00 2001
From 45e81549d601219764a5780bd77a79b852b7b1c8 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 3 Mar 2016 02:32:10 -0600
Subject: [PATCH] Player Tab List and Title APIs
diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
index 3f5d6c3239..e23c239226 100644
--- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
+++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
@@ -354,6 +354,7 @@ public interface IChatBaseComponent extends Message, Iterable<IChatBaseComponent
return a.toJsonTree(ichatbasecomponent);
}
+ public static IChatBaseComponent jsonToComponent(String json) { return a(json);} // Paper - OBFHELPER
@Nullable
public static IChatBaseComponent a(String s) {
return (IChatBaseComponent)ChatDeserializer.a(a, s, IChatBaseComponent.class, false);
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
index 267b69de30..29cbe15a82 100644
--- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
@ -42,7 +54,7 @@ index 267b69de30..29cbe15a82 100644
if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3cc16b6923..eceba690af 100644
index 3cc16b6923..f518e94fe9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,5 +1,6 @@
@ -52,15 +64,28 @@ index 3cc16b6923..eceba690af 100644
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.BaseEncoding;
@@ -203,6 +204,83 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -203,6 +204,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
+ // Paper start
+ @Override
+ public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
+ setPlayerListHeader(header == null ? null : net.md_5.bungee.chat.ComponentSerializer.toString(header));
+ setPlayerListFooter(footer == null ? null : net.md_5.bungee.chat.ComponentSerializer.toString(footer));
+ if (header != null) {
+ String headerJson = net.md_5.bungee.chat.ComponentSerializer.toString(footer);
+ playerListHeader = net.minecraft.server.ChatBaseComponent.ChatSerializer.jsonToComponent(headerJson);
+ } else {
+ playerListHeader = null;
+ }
+
+ if (footer != null) {
+ String headerJson = net.md_5.bungee.chat.ComponentSerializer.toString(footer);
+ playerListFooter = net.minecraft.server.ChatBaseComponent.ChatSerializer.jsonToComponent(headerJson);
+ } else {
+ playerListFooter = null;
+ }
+
+ updatePlayerListHeaderFooter();
+ }
+
+ @Override

8
Spigot-Server-Patches/0056-Configurable-inter-world-teleportation-safety.patch
View file

@ -1,4 +1,4 @@
From 4a30598e11988808422e02822c399e739869d129 Mon Sep 17 00:00:00 2001
From 3f7bd3fd28d287f558a40a06fea932312f1daa8b Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Thu, 3 Mar 2016 02:50:31 -0600
Subject: [PATCH] Configurable inter-world teleportation safety
@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended
This only is the case if the player is teleporting between worlds.
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index c982869995..4a2d296746 100644
index 86ec62fb3f..da68152a70 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -188,4 +188,9 @@ public class PaperWorldConfig {
@ -43,10 +43,10 @@ index 4320efaef5..9f2c7d3f45 100644
entityplayer.getBukkitEntity().setVelocity(velocity);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8db92714ea..86f485e6ff 100644
index f518e94fe9..42ee0efc1b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -701,7 +701,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -714,7 +714,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (fromWorld == toWorld) {
entity.playerConnection.teleport(to);
} else {

6
Spigot-Server-Patches/0061-Complete-resource-pack-API.patch
View file

@ -1,11 +1,11 @@
From d82d48df94d3dac694ab0f224e66da617ae13c17 Mon Sep 17 00:00:00 2001
From 22ccbf55c661d74d594b10f808239aff3eb18850 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 86f485e6ff..b56bb9d531 100644
index 42ee0efc1b..cd32239132 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -128,6 +128,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -19,7 +19,7 @@ index 86f485e6ff..b56bb9d531 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1739,6 +1743,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1752,6 +1756,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().server.getCommandDispatcher().a(getHandle());
}

8
Spigot-Server-Patches/0074-handle-NaN-health-absorb-values-and-repair-bad-data.patch
View file

@ -1,11 +1,11 @@
From 78a9c971819c0eb757da00c04b27847e7826c7be Mon Sep 17 00:00:00 2001
From f328c4bf3c1f82b1e19a8f20201e5b938efb04c3 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400
Subject: [PATCH] handle NaN health/absorb values and repair bad data
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 442981f938..edd2ffa394 100644
index e4b64b2d26..f482011175 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -499,7 +499,13 @@ public abstract class EntityLiving extends Entity {
@ -44,10 +44,10 @@ index 442981f938..edd2ffa394 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b56bb9d531..f4d06a9465 100644
index cd32239132..fed28ecd91 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1550,6 +1550,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1563,6 +1563,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void setRealHealth(double health) {

6
Spigot-Server-Patches/0099-Workaround-for-setting-passengers-on-players.patch
View file

@ -1,4 +1,4 @@
From fa5133d699ea96ded87fd66e7c663658e7bf4cd9 Mon Sep 17 00:00:00 2001
From 7bc3196c89fcd80331a6d656f015b0d782f77094 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 10 Apr 2016 03:23:32 -0500
Subject: [PATCH] Workaround for setting passengers on players
@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
SPIGOT-1915 & GH-114
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f4d06a9465..9a3e36f17f 100644
index fed28ecd91..0c8cfd5fb9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -711,6 +711,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -724,6 +724,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return true;
}

8
Spigot-Server-Patches/0106-Implement-PlayerLocaleChangeEvent.patch
View file

@ -1,4 +1,4 @@
From ebbb27eee3f336821cdbf6db5796e3bf5ec04471 Mon Sep 17 00:00:00 2001
From c85e00652bfa381d89b531ac65e3bb3fffac1d1f Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent
@ -39,10 +39,10 @@ index a9b08dcb0e..68e71a2f9d 100644
this.ct = packetplayinsettings.e();
this.getDataWatcher().set(EntityPlayer.bx, Byte.valueOf((byte) packetplayinsettings.f()));
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9a3e36f17f..e98f344c52 100644
index 0c8cfd5fb9..291b664b66 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1723,8 +1723,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1736,8 +1736,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale() {
@ -55,7 +55,7 @@ index 9a3e36f17f..e98f344c52 100644
}
// Paper start
@@ -1813,7 +1815,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1826,7 +1828,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale()
{

6
Spigot-Server-Patches/0161-String-based-Action-Bar-API.patch
View file

@ -1,4 +1,4 @@
From b63f8f73cacbf9ed1daaf8b6b722c9db0a51157f Mon Sep 17 00:00:00 2001
From 20364ef3583380d8cbbf06c6259102eb37f0aa8c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 27 Dec 2016 15:02:42 -0500
Subject: [PATCH] String based Action Bar API
@ -62,7 +62,7 @@ index 9f9341c98f..966309a07d 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 03c262935d..2837fb87e5 100644
index 291b664b66..478f027848 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -209,6 +209,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -83,7 +83,7 @@ index 03c262935d..2837fb87e5 100644
+
@Override
public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
setPlayerListHeader(header == null ? null : net.md_5.bungee.chat.ComponentSerializer.toString(header));
if (header != null) {
--
2.18.0

6
Spigot-Server-Patches/0192-Fix-Anvil-Level-sync-to-client.patch
View file

@ -1,4 +1,4 @@
From 7925cf56b5e55b1d3f53e3299dd256d2cf6a21a7 Mon Sep 17 00:00:00 2001
From 2fab2f4cddf28bbb8cf9a29cdd7f24a67df6bab4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 11 Jul 2017 23:17:57 -0400
Subject: [PATCH] Fix Anvil Level sync to client
@ -26,10 +26,10 @@ index a8a875fe11..f2e15fa545 100644
this.lastLevelCost = this.levelCost;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2837fb87e5..b3479a6194 100644
index 478f027848..99ae00785e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1418,6 +1418,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1431,6 +1431,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (container.getBukkitView().getType() != prop.getType()) {
return false;
}

6
Spigot-Server-Patches/0224-Ability-to-apply-mending-to-XP-API.patch
View file

@ -1,4 +1,4 @@
From 65f0017a20693d08e7505bacc012ce1acc342be6 Mon Sep 17 00:00:00 2001
From e29e1efa974cfbf93d20d5b08b5effd6fc3eb67b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Dec 2017 17:36:49 -0500
Subject: [PATCH] Ability to apply mending to XP API
@ -52,10 +52,10 @@ index dcef63bb1f..53cfc10017 100644
return i * 2;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a89fbc6027..c2016ba003 100644
index 00704e4ca9..ab7fa24c3d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1010,8 +1010,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1023,8 +1023,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return GameMode.getByValue(getHandle().playerInteractManager.getGameMode().getId());
}

12
Spigot-Server-Patches/0244-Player.setPlayerProfile-API.patch
View file

@ -1,4 +1,4 @@
From d9019b0d583c4ca557c6faa4a31ee24efec192ce Mon Sep 17 00:00:00 2001
From a22b8f915d6161b62f2cd0ef43082694d971f03e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 18 Mar 2018 12:29:48 -0400
Subject: [PATCH] Player.setPlayerProfile API
@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
This can be useful for changing name or skins after a player has logged in.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index fcb5f07d78..0551ae2290 100644
index 489888a26f..a68796030d 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -67,7 +67,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -48,7 +48,7 @@ index ab85fd9a6e..5778a5201d 100644
uniqueId = i.getId();
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c2016ba003..41bd979797 100644
index ab7fa24c3d..0f2550d9e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,6 +1,8 @@
@ -60,7 +60,7 @@ index c2016ba003..41bd979797 100644
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableSet;
import com.google.common.io.BaseEncoding;
@@ -1179,8 +1181,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1192,8 +1194,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
hiddenPlayers.put(player.getUniqueId(), hidingPlugins);
// Remove this player from the hidden player's EntityTrackerEntry
@ -76,7 +76,7 @@ index c2016ba003..41bd979797 100644
EntityTrackerEntry entry = tracker.trackedEntities.get(other.getId());
if (entry != null) {
entry.clear(getHandle());
@@ -1221,8 +1229,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1234,8 +1242,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
hiddenPlayers.remove(player.getUniqueId());
@ -91,7 +91,7 @@ index c2016ba003..41bd979797 100644
getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
@@ -1231,6 +1244,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1244,6 +1257,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
entry.updatePlayer(getHandle());
}
}

6
Spigot-Server-Patches/0250-Flag-to-disable-the-channel-limit.patch
View file

@ -1,4 +1,4 @@
From 4e6595031c8a8b43495ef22a9fe386b891fbeb75 Mon Sep 17 00:00:00 2001
From a6713bd18fd57bcf8ea9e3185cd84193c84f089c Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Sat, 31 Mar 2018 17:04:26 +0100
Subject: [PATCH] Flag to disable the channel limit
@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
provide an optional flag to disable this check, at your own risk.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 41bd979797..88caea739c 100644
index 0f2550d9e9..40b590da36 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -133,6 +133,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -20,7 +20,7 @@ index 41bd979797..88caea739c 100644
// Paper end
public CraftPlayer(CraftServer server, EntityPlayer entity) {
@@ -1446,7 +1447,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1459,7 +1460,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void addChannel(String channel) {

10
Spigot-Server-Patches/0284-InventoryCloseEvent-Reason-API.patch
View file

@ -1,4 +1,4 @@
From 7410f337fa9fc6c0ff7ecc4797c8e7da2a8e68cb Mon Sep 17 00:00:00 2001
From 94376469b993be635f0f17cfc06dda9bdfeefec8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 3 Jul 2018 21:56:23 -0400
Subject: [PATCH] InventoryCloseEvent Reason API
@ -29,7 +29,7 @@ index 6bbb737df7..614fce4447 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 6ae76477c0..f2bce333d9 100644
index c8bf8832bd..6e5ffe4da7 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -153,7 +153,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -110,7 +110,7 @@ index 49470bf5f0..781c8abc39 100644
this.m();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f735d97be2..6fe79e9076 100644
index 16af56fd18..6563785042 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2056,7 +2056,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -155,10 +155,10 @@ index 92fe80316f..70a4dbe26b 100644
public boolean isBlocking() {
return getHandle().isBlocking();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 88caea739c..b7144c5d2f 100644
index 40b590da36..f372f19dec 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -727,7 +727,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -740,7 +740,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Close any foreign inventory
if (getHandle().activeContainer != getHandle().defaultContainer) {