Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2025-02-16 12:21:37 +01:00
Code Issues Projects Releases Wiki Activity

Updated Upstream and Sidestream(s) (Tuinity/Purpur)

Browse Source 
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
f559558 Updated Upstream (Paper)

Purpur Changes:
1eaac71 Updated Upstream (Paper & Tuinity)
137523f Fix allowing color codes in signs
This commit is contained in:
Ivan Pekov 2020-11-08 18:59:56 +02:00
parent 4de3427248
commit 830bb6b70d
No known key found for this signature in database
GPG Key ID: BC975C392D9CA3A3
18 changed files with 72 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -10,7 +10,6 @@ on:
- ver/1.16.3
- ver/1.16.2
- ver/1.16.1
- dev/ver/1.16.3
pull_request:
paths-ignore:
- '*.md'
@ -20,7 +19,6 @@ on:
- ver/1.16.3
- ver/1.16.1
- ver/1.16.2
- dev/ver/1.16.3
jobs:
build:
@ -72,7 +70,7 @@ jobs:
run: |
./yatopia full
- name: Upload Artifact
if: github.ref != 'refs/heads/ver/1.16.3'
if: github.ref != 'refs/heads/ver/1.16.4'
uses: actions/upload-artifact@v2
with:
name: Yatopia-${{ matrix.java }}

4
.gitmodules vendored
View File

@ -1,7 +1,7 @@
[submodule "Tuinity"]
path = Tuinity
url = https://github.com/YatopiaMC/Yatopia-Tuninty.git
branch = ver/1.16.3
branch = ver/1.16.4
[submodule "Akarin"]
path = Akarin
url = https://github.com/Akarin-project/Akarin.git
@ -9,7 +9,7 @@
[submodule "Purpur"]
path = Purpur
url = https://github.com/pl3xgaming/Purpur.git
branch = ver/1.16.3
branch = ver/1.16.4
[submodule "Empirecraft"]
path = Empirecraft
url = https://github.com/starlis/empirecraft.git

15
PATCHES.md
View File

@ -10,17 +10,17 @@ # Patches
| ----- | ------------- |:-------------:| -----:|
| server | Add 5 second tps average in /tps | William Blake Galbreath | |
| api | Add ChatColor.getById | Aikar | |
| server | Add GameProfileLookupEvent | tr7zw | |
| api | Add GameProfileLookupEvent | tr7zw | |
| server | Add GameProfileLookupEvent | tr7zw | |
| server | Add GlueList | Mykyta Komarn | |
| server | Add IntelliJ IDEA runnable | Bud Gidiere | |
| server | Add JsonList save timings | Ivan Pekov | |
| server | Add NBT API as a first-class lib | tr7zw | |
| api | Add NBT API as a first-class lib | tr7zw | |
| server | Add StructureLocateEvent | dfsek | |
| server | Add NBT API as a first-class lib | tr7zw | |
| api | Add StructureLocateEvent | dfsek | |
| server | Add last tick time API | Ivan Pekov | tr7zw |
| server | Add StructureLocateEvent | dfsek | |
| api | Add last tick time API | Ivan Pekov | tr7zw |
| server | Add last tick time API | Ivan Pekov | tr7zw |
| server | Add no-tick block list | William Blake Galbreath | |
| server | Add nspt command | Ivan Pekov | |
| server | Add option to disable dolphin treasure searching | William Blake Galbreath | |
@ -77,8 +77,8 @@ # Patches
| server | MC-168772 Fix - Add turtle egg block options | William Blake Galbreath | |
| server | MC-4 Fix - Item position desync | William Blake Galbreath | |
| server | Make sure the block is cauldron before proceeding | Ivan Pekov | |
| server | Modify POM | YatopiaMC | |
| api | Modify POM | YatopiaMC | |
| server | Modify POM | YatopiaMC | |
| server | Modify default configs | tr7zw | |
| server | Nuke streams off BlockPosition | Ivan Pekov | |
| server | Nuke streams off SectionPosition | Ivan Pekov | |
@ -98,13 +98,12 @@ # Patches
| server | PaperPR: Use block distance in portal search radius | Patrick Hemmer | |
| server | Per entity (type) collision settings | MrIvanPlays | tr7zw |
| server | Persistent TileEntity Lore and DisplayName | jmp | |
| server | PlayerAttackEntityEvent | Ivan Pekov | |
| api | PlayerAttackEntityEvent | Ivan Pekov | |
| server | ProxyForwardDataEvent | Ivan Pekov | |
| server | PlayerAttackEntityEvent | Ivan Pekov | |
| api | ProxyForwardDataEvent | Ivan Pekov | |
| server | ProxyForwardDataEvent | Ivan Pekov | |
| server | Purpur config files | William Blake Galbreath | |
| server | Redirect Configs | tr7zw | |
| api | Remove Streams using IntelliJ IDEA | ㄗㄠˋ ㄑㄧˊ | |
| server | Remove some streams and object allocations | Phoenix616 | |
| server | Remove vanilla profiler callers | Sotr | |
| server | Respect PlayerKickEvent leaveMessage | Ivan Pekov | |

2
Purpur

@ -1 +1 @@
Subproject commit 306e9accab54a304933ea5316c57dfefd05c838a
Subproject commit 1eaac716d263fa68cd84bc115166f3b7b6b8cb69

2
Tuinity

@ -1 +1 @@
Subproject commit d7f2b6eb661b4ee55ff0e4d410bfa79ac05c97a6
Subproject commit f559558e25dd98e073a8d22ec567c23e82e6fce2

2
patches/api/0006-Add-NBT-API-as-a-first-class-lib.patch
View File

@ -77,7 +77,7 @@ index 3b10fcc13893403b29f0260b8605144679e89b82..1e9a96d8b08cc396acf73dc420830093
+ // Yatopia end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 4d1970bec04c5a3cf01d214f583efb0e1d08380d..97fad9d83badb0aff15189f62cc065dae90ad3df 100644
index ff2e4fc8a632453e280f1a6ec05878b0e7fd2a9c..d07ea59deea33b6c425b26cfa14f6b3087b7ff79 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -696,4 +696,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

47
patches/server/0001-Yatopia-Server-Fixes.patch
View File

@ -1180,10 +1180,10 @@ index 963c90c065a9e362c8c3030bb36ac6bf0c14a8e2..00000000000000000000000000000000
-
- public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 87dd140189a34770afe22e54014c1d069f6621b2..81f7fec0a382a0003c4b243271ea205faccec32b 100644
index 21fec686282d2d2190e26e541d5b2b4d3d03c730..12922030c7ab0267018158d3fccb0eeedc370b7c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1298,7 +1298,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1299,7 +1299,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
playerSaveInterval = autosavePeriod;
}
// Paper end
@ -1343,7 +1343,7 @@ index 313aa8f7d47c53a6a0130994c9d61d7c073c95c6..00000000000000000000000000000000
- this.generator = gen;
- this.world = new CraftWorld((WorldServer) this, gen, env);
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
index d627a25830646d8808950238f451fa0adbab4ec6..a959672f5857b987001252c3fd7ace9e83e07c9b 100644
index 2efe5db22422b25d0237744fa384f8974a52fbc2..1f77b251d7e7b0f023793cbf0876fc067caa75c1 100644
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
@@ -61,7 +61,7 @@ public class WorldNBTStorage {
@ -1372,9 +1372,21 @@ index 3a35169eaf680c45fe42922eb5f0014fa422c31c..00000000000000000000000000000000
- }
- // Spigot Start
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 78dc3c38def9cadd5fe504b1c66470e444a433c4..81c54b547c0930b186557045906dbc6baa79ef5b 100644
index 78dc3c38def9cadd5fe504b1c66470e444a433c4..fbe1d388fa721e09ab63bed618bc20b958c652fe 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -872,9 +872,9 @@ public class WorldServer extends World implements GeneratorAccessSeed {
// Tuinity end - optimise checkDespawn
this.ticking = true;
- gameprofilerfiller.enter("world border");
+ //gameprofilerfiller.enter("world border"); // Akarin - remove caller
this.getWorldBorder().s();
- gameprofilerfiller.exitEnter("weather");
+ //gameprofilerfiller.exitEnter("weather"); // Akarin - remove caller
boolean flag = this.isRaining();
if (this.getDimensionManager().hasSkyLight()) {
@@ -1007,11 +1007,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {
this.Q();
@ -1453,6 +1465,15 @@ index 78dc3c38def9cadd5fe504b1c66470e444a433c4..81c54b547c0930b186557045906dbc6b
}
this.chunkCheck(entity1);
@@ -1491,7 +1491,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
public void chunkCheck(Entity entity) {
if (entity.cl()) {
- this.getMethodProfiler().enter("chunkCheck");
+ //this.getMethodProfiler().enter("chunkCheck"); // Akarin - remove caller
int i = MathHelper.floor(entity.locX() / 16.0D);
int j = Math.min(15, Math.max(0, MathHelper.floor(entity.locY() / 16.0D))); // Paper - stay consistent with chunk add/remove behavior
int k = MathHelper.floor(entity.locZ() / 16.0D);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java.rej b/src/main/java/net/minecraft/server/WorldServer.java.rej
deleted file mode 100644
index 8aa3dd3a0a0db575292be8d9c73bb3083849622b..0000000000000000000000000000000000000000
@ -1817,6 +1838,24 @@ index 1ed00fb04c8c8b5a823894a4c3df8f2eca4dd5ad..6c7eabe57ade13d9ac2a2bbfc406fcf7
+ }
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java.rej b/src/main/java/org/bukkit/craftbukkit/CraftServer.java.rej
deleted file mode 100644
index 1f7601aede1b8460f48ebaae18b9c5b68bc044c8..0000000000000000000000000000000000000000
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java.rej
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java (rejected hunks)
-@@ -2443,5 +2443,10 @@ public final class CraftServer implements Server {
- public String getServerName() {
- return getProperties().serverName;
- }
-+
-+ @Override
-+ public boolean isLagging() {
-+ return getServer().lagging;
-+ }
- // Purpur end
- }
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 210cb10ea75b99d3b5d7b5bce5cea44e3cc0fc20..62012d2b780d3399bd641ca3ca4a4ac127e3bcb5 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java

4
patches/server/0003-Brandings.patch
View File

@ -39,10 +39,10 @@ index 74ed02fa9296583977bb721014b10ff8b708b43c..a13c7b2b5bc79ecaea404779149ed02c
.completer(new ConsoleCommandCompleter(this.server))
);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 81f7fec0a382a0003c4b243271ea205faccec32b..5835dd39db6a6e6658f777bd76ba5ab67bf73899 100644
index 12922030c7ab0267018158d3fccb0eeedc370b7c..c6ad1dd8cabdad0b8ca54eecb82f45703b3eb1f2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1523,7 +1523,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1524,7 +1524,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {

23
patches/server/0004-Utilities.patch
View File

@ -21,29 +21,6 @@ index 0000000000000000000000000000000000000000..5b2ac2bd00c49e44f5692be42e483409
+ public static final int[] EMPTY_ARRAY = new int[0];
+ public static final int[] ZERO_ARRAY = new int[]{0};
+}
diff --git a/src/main/java/net/yatopia/server/util/MathUtils.java b/src/main/java/net/yatopia/server/util/MathUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..b1d277d831a36a0f9e5c33f1957e1739de18abb5
--- /dev/null
+++ b/src/main/java/net/yatopia/server/util/MathUtils.java
@@ -0,0 +1,17 @@
+package net.yatopia.server.util;
+
+public class MathUtils {
+
+ /**
+ * An efficient modulo implementation that avoids the use of loops
+ * and instead uses faster bitwise operations to achieve the fastest
+ * possible execution time.
+ *
+ * @param dividend the dividend
+ * @param divisor the divisor
+ * @return the remainder
+ */
+ public static int fastMod(int dividend, int divisor) {
+ return dividend & (divisor - 1);
+ }
+}
diff --git a/src/main/java/net/yatopia/server/util/TimeUtils.java b/src/main/java/net/yatopia/server/util/TimeUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..d68e8ec871b99f0e6fe1c52948bedf38bd449b27

6
patches/server/0006-Add-last-tick-time-API.patch
View File

@ -7,10 +7,10 @@ Original patch by:
Co-authored-by: tr7zw <tr7zw@live.de>
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5835dd39db6a6e6658f777bd76ba5ab67bf73899..76572176f830f5d0d9c2a75dcde973f2f76e75bf 100644
index c6ad1dd8cabdad0b8ca54eecb82f45703b3eb1f2..22792d8097351c5d1c2e085a20429b28f7f90b6e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -936,6 +936,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -937,6 +937,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
// Paper End
// Spigot End
@ -19,7 +19,7 @@ index 5835dd39db6a6e6658f777bd76ba5ab67bf73899..76572176f830f5d0d9c2a75dcde973f2
protected void w() {
try {
long serverStartTime = SystemUtils.getMonotonicNanos(); // Paper
@@ -1006,7 +1008,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1007,7 +1009,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.a(gameprofilertick);
//this.methodProfiler.a(); // Akarin - remove caller
//this.methodProfiler.enter("tick"); // Akarin - remove caller

2
patches/server/0011-Modify-default-configs.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Modify default configs
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 053da5119404ded5e3cf6bb55967cc8ffba47de6..b1f1df3862455f2d1566a215bca9fc7ca7006118 100644
index c4633989c7747f3429c9c13a36613f81971a6b50..41d1e0f84c9ee35b3418100342c2fdaaf2b77498 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -201,7 +201,7 @@ public class PaperConfig {

2
patches/server/0029-Optimize-some-stuff-in-WorldServer-ticking.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Optimize some stuff in WorldServer ticking
Replaced some streams and some array lists with glue lists
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 81c54b547c0930b186557045906dbc6baa79ef5b..77cdfae804f9a3a5452dc70adc7da09d53f51998 100644
index fbe1d388fa721e09ab63bed618bc20b958c652fe..219a33195e5309a1bac279154c9be0ed7dbf2563 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -64,11 +64,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0035-lithium-collision-optimizations.patch
View File

@ -1141,7 +1141,7 @@ index db735e29d427cc8f4bd4ba54c7a44daf9fed9e61..877ef81bd8285167ce11c116b8ad803f
}
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 77cdfae804f9a3a5452dc70adc7da09d53f51998..e643043398756971571a6cba8237b74385ded898 100644
index 219a33195e5309a1bac279154c9be0ed7dbf2563..bc46696d7e397684025affcc7b59028596df7f5e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -787,8 +787,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0044-Fix-LightEngineThreaded-memory-leak.patch
View File

@ -18,7 +18,7 @@ index 2f9c97dd4e1d705a87772d18c7ab4883a876af08..f3494ac1ad659352ca5595adf9e6919b
return this.size == 0 && this.pendingTasks.isEmpty();
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index e643043398756971571a6cba8237b74385ded898..25263a2037808e57f034c22c966d8baf1ce8b5c1 100644
index bc46696d7e397684025affcc7b59028596df7f5e..735d40fede0710e9578cc60163e6c63c58ade9e5 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1913,6 +1913,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

4
patches/server/0048-Optimize-whitelist-command-for-multiple-additions-re.patch
View File

@ -185,10 +185,10 @@ index 0224a6d0e47e836fa485b39e7b4ce5b83ea554bf..fe578d306575bbdc8ca4a993a648e889
return (String[]) this.d.keySet().toArray(new String[this.d.size()]);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 76572176f830f5d0d9c2a75dcde973f2f76e75bf..1d70ed018869ebf42d5cc7ccb7387e5fb68b7fd7 100644
index 22792d8097351c5d1c2e085a20429b28f7f90b6e..5847bbf4d8250522dd39323212f619c32159c385 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1968,6 +1968,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1969,6 +1969,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
return new DataPackConfiguration(list, list1);
}

4
patches/server/0070-Smarter-statistics-ticking.patch
View File

@ -8,7 +8,7 @@ In vanilla, statistics that count time spent for an action (i.e. time played or
With an interval of 20, this patch saves roughly 3ms per tick on a server w/ 80 players online.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 1bfa1500b942905c3918f0715da0a9d534909edb..d855cd77ae0ce67aef1b6d7335e21695f9e30e4d 100644
index 1bfa1500b942905c3918f0715da0a9d534909edb..21074d369b9f7c7f101ba85a9d350627b98217d2 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -163,18 +163,23 @@ public abstract class EntityHuman extends EntityLiving {
@ -18,7 +18,7 @@ index 1bfa1500b942905c3918f0715da0a9d534909edb..d855cd77ae0ce67aef1b6d7335e21695
- this.a(StatisticList.PLAY_ONE_MINUTE);
+ // Yatopia start
+ int interval = net.yatopia.server.YatopiaConfig.playerTimeStatisticsInterval;
+ if (net.yatopia.server.util.MathUtils.fastMod(ticksLived, interval) == 0) {
+ if (ticksLived % interval == 0) {
+ this.a(StatisticList.PLAY_ONE_MINUTE, interval);
+ // Yatopia end
if (this.isAlive()) {

4
patches/server/0072-Configurable-BlockPhysicsEvent.patch
View File

@ -8,10 +8,10 @@ Paper does alleviate this quite well by only firing if plugins are listening, bu
This patch implements a hard toggle for the event.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1d70ed018869ebf42d5cc7ccb7387e5fb68b7fd7..fdf8e09b8d358e0272055c56ab0c5bf102fb6533 100644
index 5847bbf4d8250522dd39323212f619c32159c385..93a036abf2f170e62f82cd4afa40ef7e94a5021f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1411,7 +1411,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1412,7 +1412,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
while (iterator.hasNext()) {
WorldServer worldserver = (WorldServer) iterator.next();

2
patches/server/0073-Infinity-No-Arrows.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Infinity No Arrows
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index d855cd77ae0ce67aef1b6d7335e21695f9e30e4d..7dbea179fee36cee78862893552dfd2a5694398f 100644
index 21074d369b9f7c7f101ba85a9d350627b98217d2..e35087458dea5ac1736ec2d230d8c23b84800774 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -2137,7 +2137,7 @@ public abstract class EntityHuman extends EntityLiving {