diff --git a/Paper b/Paper index 7232d8f2a..ce979b29b 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 7232d8f2af6b32309efe46d88787101ea13ad458 +Subproject commit ce979b29be0d445df5e8deb6c34637a89b37f11c diff --git a/README.md b/README.md index 5d2882ce7..821d330c5 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,8 @@ Join us on [Discord](https://discord.gg/mtAAnkk) Downloads can be obtained from the [downloads page](https://purpur.pl3x.net/downloads/), the downloads API, or alternatively, from Pl3x's [Jenkins CI Server](https://ci.pl3x.net/job/Purpur/). Latest build shortcut links: -* [1.16.4](https://purpur.pl3x.net/api/v1/purpur/1.16.4/latest/download) builds 809+ +* [1.16.5](https://purpur.pl3x.net/api/v1/purpur/1.16.5/latest/download) builds 957+ +* [1.16.4](https://purpur.pl3x.net/api/v1/purpur/1.16.4/latest/download) builds 809-956 * [1.16.3](https://purpur.pl3x.net/api/v1/purpur/1.16.3/latest/download) builds 751-808 * [1.16.2](https://purpur.pl3x.net/api/v1/purpur/1.16.2/latest/download) builds 711-750 * [1.16.1](https://purpur.pl3x.net/api/v1/purpur/1.16.1/latest/download) builds 608-710 @@ -73,7 +74,7 @@ Maven net.pl3x.purpur purpur-api - 1.16.4-R0.1-SNAPSHOT + 1.16.5-R0.1-SNAPSHOT provided ``` @@ -86,7 +87,7 @@ repositories { ``` ```kotlin dependencies { - compileOnly("net.pl3x.purpur", "purpur-api", "1.16.4-R0.1-SNAPSHOT") + compileOnly("net.pl3x.purpur", "purpur-api", "1.16.5-R0.1-SNAPSHOT") } ``` diff --git a/build.gradle.kts b/build.gradle.kts index 5b3a6b33e..6b6679835 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ toothpick { ?: "\"${gitCmd("rev-parse", "--short", "HEAD").output}\"" forkVersion = "git-$forkName-$versionTag" - minecraftVersion = "1.16.4" + minecraftVersion = "1.16.5" nmsPackage = "1_16_R3" nmsRevision = "R0.1-SNAPSHOT" diff --git a/patches/api/0001-Tuinity-API-Changes.patch b/patches/api/0001-Tuinity-API-Changes.patch index e033b5aea..10fc005d1 100644 --- a/patches/api/0001-Tuinity-API-Changes.patch +++ b/patches/api/0001-Tuinity-API-Changes.patch @@ -8,7 +8,7 @@ Tuinity config API to retrieve raw YamlConfiguration + timing exports diff --git a/pom.xml b/pom.xml -index 35599164b24185bc51813ae58090f6f4bffdba4a..024be926afb1219c6443c496721f4bd0a4fec222 100644 +index 6c6ae6b48094c86c74cd4e9f4214056f63e6ac68..c441d455e2273b63d2cec136872a5025182d75d6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,18 +3,18 @@ @@ -26,7 +26,7 @@ index 35599164b24185bc51813ae58090f6f4bffdba4a..024be926afb1219c6443c496721f4bd0 - com.destroystokyo.paper - paper-api + tuinity-api - 1.16.4-R0.1-SNAPSHOT + 1.16.5-R0.1-SNAPSHOT jar - Paper-API diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch index 49134610e..095f776ab 100644 --- a/patches/server/0001-Tuinity-Server-Changes.patch +++ b/patches/server/0001-Tuinity-Server-Changes.patch @@ -425,7 +425,7 @@ This patch also prevents the saving/unloading of POI data when world saving is disabled. diff --git a/pom.xml b/pom.xml -index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78ee27f3cee 100644 +index 9ba379b7e3ee3bc8c6d2c8ec46213c404c73d682..e83e4241a56fe131a75fe21cc1518992c089da2c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,11 @@ @@ -435,7 +435,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e - paper + tuinity jar - 1.16.4-R0.1-SNAPSHOT + 1.16.5-R0.1-SNAPSHOT - Paper - https://papermc.io + Tuinity-Server @@ -443,7 +443,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e -@@ -18,16 +18,16 @@ +@@ -19,16 +19,16 @@ @@ -464,7 +464,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e ${project.version} compile -@@ -37,6 +37,13 @@ +@@ -38,6 +38,13 @@ ${project.version} compile @@ -478,7 +478,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e io.papermc minecraft-server -@@ -97,11 +104,7 @@ +@@ -105,11 +112,7 @@ cleaner 1.0-SNAPSHOT @@ -491,7 +491,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e com.googlecode.json-simple -@@ -141,6 +144,13 @@ +@@ -149,6 +152,13 @@ 4.8.47 test @@ -505,7 +505,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e -@@ -165,15 +175,15 @@ +@@ -173,15 +183,15 @@ @@ -9634,7 +9634,7 @@ index 550232cb3819138b3bae0fa1c51429485e8bc593..229c3b0f0c650b501f31147adaa17194 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 36fbe16e6f06fca3eb282cce5b8c5fcc87a0166d..259ee6dd50c0782b1d137cadba878e7c209f3329 100644 +index f9d7419e376268b00db2eb98a3db4116bdb72bd8..a125489d6a3b202d7e2b3d7df26fd72b81f2bd98 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -10030,7 +10030,7 @@ index 36fbe16e6f06fca3eb282cce5b8c5fcc87a0166d..259ee6dd50c0782b1d137cadba878e7c } @@ -2849,7 +3092,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - this.cp().forEach((entity) -> { + this.recursiveStream().forEach((entity) -> { worldserver.chunkCheck(entity); entity.az = true; - Iterator iterator = entity.passengers.iterator(); @@ -10079,7 +10079,7 @@ index 957a351c3f6c4f66d7af6657ab0c3cbeed94662f..57166a543a9af9e10e38c983487fac7e this.setPersistent(); } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 6d716214e756fe1326cd3d2becea969076f6fd5b..fb1d640d89258477dd1286fff929deecffb69d9e 100644 +index eb5c3a1f0d9ff665631caf5bf579e83d1ed25e4f..7582a3a0955db2bc79daeced8e9c869f4276815a 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -710,7 +710,13 @@ public abstract class EntityInsentient extends EntityLiving { @@ -10111,7 +10111,7 @@ index f41aaa7623c052b9f4044898d1bdee898c03057a..d99cecc4075338d7b8f154ab94d8ac04 x = MathHelper.floorLong(x * 4096.0D) * (1 / 4096.0D); y = MathHelper.floorLong(y * 4096.0D) * (1 / 4096.0D); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index c8cdce899b109a7f554fec7aaa8235df4224cd1d..1c396ec56f35d8764e3bf7b67a7984393eb94b3b 100644 +index d417878a1584c9e5ec33b94fc65b29f84fb3a5e9..4fe5a8d0201d662c68dd58eeb8cf1d304787edb4 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2858,7 +2858,11 @@ public abstract class EntityLiving extends Entity { @@ -10138,7 +10138,7 @@ index c8cdce899b109a7f554fec7aaa8235df4224cd1d..1c396ec56f35d8764e3bf7b67a798439 } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 7240b885d96eb2df187b6229449af1a893a4524e..40f56858143651bb0addd0b74db7388ecbe56521 100644 +index 04d505c7a19775d0353c10424a84a1ce8885dc2c..9f5b7243ccbe0729a061345c25033d9145b91b3f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -527,6 +527,185 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -10340,7 +10340,7 @@ index 4efc40c01ec12b80bd7cf9d35cf0ea0df973baf7..f322dccd834ff56b99f8796309709b5b if (!list.equals(this.p)) { diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java -index 36aafc3b71013bcec0f4d956761fc2710848b3fd..c9963c19892c3e408964b72983bc6e26f8b63b67 100644 +index 1aa070db60f5473576fb5d056cadde5106766489..24e6f3141ff4434f770e956a8d240bf856442933 100644 --- a/src/main/java/net/minecraft/server/EnumDirection.java +++ b/src/main/java/net/minecraft/server/EnumDirection.java @@ -160,8 +160,8 @@ public enum EnumDirection implements INamable { @@ -11113,7 +11113,7 @@ index ff74be14512a947e81b62d53e616131ca7d7f609..e79e773f2219f9a9ae076fcbc8108b79 public static void mergeSortedSets(final java.util.function.Consumer consumer, final java.util.Comparator comparator, final java.util.SortedSet...sets) { final ObjectRBTreeSet all = new ObjectRBTreeSet<>(comparator); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c3fb69b18bf66ac8532196d953d9729ffb394721..28c1995e37cb134979b953028844fd5567aa9d00 100644 +index 8c384171ca56a0989ffef1813ad0a9ee3ea31d29..45e310e249a83714d0001d85b2ead8d4f8a2d742 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -151,6 +151,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant @@ -48,7 +48,7 @@ index 229c3b0f0c650b501f31147adaa17194af57fedd..f88cf526d272fe47b5a474c0b344b748 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 28c1995e37cb134979b953028844fd5567aa9d00..717978668d0706e5ec30f0a22d7e52fd80fdd348 100644 +index 45e310e249a83714d0001d85b2ead8d4f8a2d742..af5c1479d2cb8092d84e2d3d5166060d9ff2df71 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1511,7 +1511,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6a58b368b9397a5e529cf4e1e532ca30ed312fb5..536458e5209ee15ea1c1a399808e157a07899e07 100644 +index efe2a9ad2ece23bd71f4ad63b2c6f54f42345b55..2315c71465e4c1ea00a4c355b43de1e3fb0ca995 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -101,6 +101,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch index 480fba387..f737ebb6d 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0018-Player-invulnerabilities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 82b975dd483b55461df0e110add5546a7815c650..6f8bc857141b7e9a3444b81cddd13228f8cbb9a5 100644 +index dc69cba40806782e0b8ffd3b77aa6298feddb35d..ca63c583524c760072933602079ffe34796ff83c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -150,6 +150,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0020-Configurable-villager-brain-ticks.patch b/patches/server/0020-Configurable-villager-brain-ticks.patch index cd5dad77d..d663244db 100644 --- a/patches/server/0020-Configurable-villager-brain-ticks.patch +++ b/patches/server/0020-Configurable-villager-brain-ticks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager brain ticks diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 2c4c13b30b4533f5476f1128317d477ad8001bf5..171e8553a339eb3c995369f274de86b824183ca6 100644 +index 21d0570a59240e955ff148bac0226b220a7dec36..c034869310ca3dadbfe5425c45aaa80dac59ac88 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -58,6 +58,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation diff --git a/patches/server/0027-Giants-AI-settings.patch b/patches/server/0027-Giants-AI-settings.patch index dd6135ad7..e5a897647 100644 --- a/patches/server/0027-Giants-AI-settings.patch +++ b/patches/server/0027-Giants-AI-settings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Giants AI settings diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 259ee6dd50c0782b1d137cadba878e7c209f3329..7c5977b074a4dbce982b5979d6d8d3422baa6655 100644 +index a125489d6a3b202d7e2b3d7df26fd72b81f2bd98..2a054887648012fe8f6dbbd9f7a16884fa7882f1 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -98,7 +98,7 @@ index 9f4f56c47ecd4b35ebf33ca0bf9a040074ababf2..565c938d879940d8e12fe320ea8524d2 } } diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index fb1d640d89258477dd1286fff929deecffb69d9e..dfedabaeb88b66420db39380fa824cee2d45687b 100644 +index 7582a3a0955db2bc79daeced8e9c869f4276815a..7d9027d881e6e3eb0d1f8478ac7a1501dc5dec1d 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -949,6 +949,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -118,7 +118,7 @@ index fb1d640d89258477dd1286fff929deecffb69d9e..dfedabaeb88b66420db39380fa824cee float f = difficultydamagescaler.d(); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 144c443f6f8b7ab2c6df2d32c27ef8bed21ce9dd..01c37b61a5f848588025540a20762954ea2695a5 100644 +index 50cb2551598101d1c12007c53421b6c2f59ce2aa..02a49d9ddc58f44471f92cd40b8b968fc7984e73 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -165,6 +165,7 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0029-Zombie-horse-naturally-spawn.patch b/patches/server/0029-Zombie-horse-naturally-spawn.patch index 2f2147a76..2c71b2c85 100644 --- a/patches/server/0029-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0029-Zombie-horse-naturally-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 536458e5209ee15ea1c1a399808e157a07899e07..689504bb79de406c783a0fb926ed1366cbd213e1 100644 +index 2315c71465e4c1ea00a4c355b43de1e3fb0ca995..2f41a537fb1d8348b5f65a3e85da841761311744 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -996,12 +996,18 @@ public class WorldServer extends World implements GeneratorAccessSeed { diff --git a/patches/server/0038-Add-option-to-set-armorstand-step-height.patch b/patches/server/0038-Add-option-to-set-armorstand-step-height.patch index cae98d06f..069dba0b8 100644 --- a/patches/server/0038-Add-option-to-set-armorstand-step-height.patch +++ b/patches/server/0038-Add-option-to-set-armorstand-step-height.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to set armorstand step height diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index d6de166babe2e25a88f9e6dae462907e26b6fb6f..faa221038df6bed02a2433855ed7c7e0f89c6024 100644 +index bf932bf0eea4e52603b3b4ec41013df7c930773d..41a36ce6d446b78bdd7a4739ad372a2ee19da116 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -625,6 +625,7 @@ public class EntityArmorStand extends EntityLiving { diff --git a/patches/server/0041-Cows-eat-mushrooms.patch b/patches/server/0041-Cows-eat-mushrooms.patch index 37c7eed3d..a44b34935 100644 --- a/patches/server/0041-Cows-eat-mushrooms.patch +++ b/patches/server/0041-Cows-eat-mushrooms.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cows eat mushrooms diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 7c5977b074a4dbce982b5979d6d8d3422baa6655..846ed3cf74aac48ee8db8d364ef0a002980e355f 100644 +index 2a054887648012fe8f6dbbd9f7a16884fa7882f1..dd8396e7acb3e89b9500368273fcd7361160b10c 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2786,6 +2786,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -110,7 +110,7 @@ index 42e6761c8b18b79ffd3f4d5e853ea87a2c153c23..cfb009c811bd2908d38da1b0007cb7aa public EntityCow createChild(WorldServer worldserver, EntityAgeable entityageable) { return (EntityCow) EntityTypes.COW.a((World) worldserver); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 01c37b61a5f848588025540a20762954ea2695a5..5ab1121c99c67662ce659428be46f2189f7e2d04 100644 +index 02a49d9ddc58f44471f92cd40b8b968fc7984e73..65a54b6bf113ca6e88929e23c5d5cbfc6cfc7bad 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0048-Signs-allow-color-codes.patch b/patches/server/0048-Signs-allow-color-codes.patch index d6570d683..1a4360b0d 100644 --- a/patches/server/0048-Signs-allow-color-codes.patch +++ b/patches/server/0048-Signs-allow-color-codes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 6f8bc857141b7e9a3444b81cddd13228f8cbb9a5..26c508258f1638fcf7d11ba87816cdf4771e9fc6 100644 +index ca63c583524c760072933602079ffe34796ff83c..eddec84023a3458deebec28215aba9acc87489c1 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1429,6 +1429,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0050-Controllable-Minecarts.patch b/patches/server/0050-Controllable-Minecarts.patch index c6f794a2e..eaa7bb866 100644 --- a/patches/server/0050-Controllable-Minecarts.patch +++ b/patches/server/0050-Controllable-Minecarts.patch @@ -22,7 +22,7 @@ index 2291135eaef64c403183724cb6e413cd7e472672..bc61aaff65a7dc1e7534452b285953b8 super(i, j, k); } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 5ab1121c99c67662ce659428be46f2189f7e2d04..802d5488876a4bebad18fbb6b2256c0259ba50c2 100644 +index 65a54b6bf113ca6e88929e23c5d5cbfc6cfc7bad..4bd1322892e1c46addd795254d9ae6d3e7dc1e5b 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -98,9 +98,9 @@ public abstract class EntityLiving extends Entity { @@ -106,7 +106,7 @@ index efe5c0cecaf12ef921f6d32ff6670eff051bf323..a814cf280d1ce0d446d24da8e596f13e this.move(EnumMoveType.SELF, this.getMot()); if (!this.onGround) { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 26c508258f1638fcf7d11ba87816cdf4771e9fc6..452675eb071513609665ec214ddb0b01874c3a09 100644 +index eddec84023a3458deebec28215aba9acc87489c1..f4d9ac6efa29e5aa26b819ff05e5500104dcb6bf 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1004,6 +1004,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch index 56efc5408..52250e03f 100644 --- a/patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable loot drops on death by cramming diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 802d5488876a4bebad18fbb6b2256c0259ba50c2..737b812d3932de29233b26fe7a978b98b2c3cc8f 100644 +index 4bd1322892e1c46addd795254d9ae6d3e7dc1e5b..bef80c83c551abe2cc23cf73e6c737313ad399c9 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1493,8 +1493,10 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0052-Players-should-not-cram-to-death.patch b/patches/server/0052-Players-should-not-cram-to-death.patch index 1c099a234..e2aa8d884 100644 --- a/patches/server/0052-Players-should-not-cram-to-death.patch +++ b/patches/server/0052-Players-should-not-cram-to-death.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Players should not cram to death diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 452675eb071513609665ec214ddb0b01874c3a09..a86e29ff086a4fe8aa4e8395ba420c0aff8f0be0 100644 +index f4d9ac6efa29e5aa26b819ff05e5500104dcb6bf..ff4e60e321e0df7d43078ae0899b9e08717ad9b3 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1406,7 +1406,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0055-Fix-the-dead-lagging-the-server.patch b/patches/server/0055-Fix-the-dead-lagging-the-server.patch index 0ad72a4f0..4626cac7a 100644 --- a/patches/server/0055-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0055-Fix-the-dead-lagging-the-server.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 846ed3cf74aac48ee8db8d364ef0a002980e355f..1210b1d2ac1b129342d80c2a47cd79e1c21be2a5 100644 +index dd8396e7acb3e89b9500368273fcd7361160b10c..1536450440d1b35f6623c2a997ac816eb3d291fc 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1532,6 +1532,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -17,7 +17,7 @@ index 846ed3cf74aac48ee8db8d364ef0a002980e355f..1210b1d2ac1b129342d80c2a47cd79e1 public void f(double d0, double d1, double d2) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 737b812d3932de29233b26fe7a978b98b2c3cc8f..435726651ada6ccb4bbd31fe21a439d29f131098 100644 +index bef80c83c551abe2cc23cf73e6c737313ad399c9..9b1ecf6101e146843b4d2eeabc3e0e3c4fde54b5 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2492,7 +2492,7 @@ public abstract class EntityLiving extends Entity { diff --git a/patches/server/0059-Configurable-TPS-Catchup.patch b/patches/server/0059-Configurable-TPS-Catchup.patch index d28786bc2..4594fac63 100644 --- a/patches/server/0059-Configurable-TPS-Catchup.patch +++ b/patches/server/0059-Configurable-TPS-Catchup.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable TPS Catchup diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a3fb9cc93a759074e2ae987dd48a1361d64d60c1..6b9199a3d42f9854a74e239c3f74230ca92dad1c 100644 +index d79cf993cdadfe7fadd6c7e65b9fc691a298c702..942f556eca32ce13c6b3490ef0d6f9e960a36d06 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1002,7 +1002,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant -1) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1210b1d2ac1b129342d80c2a47cd79e1c21be2a5..79f418054f91184b73759296cef15beb410edeae 100644 +index 1536450440d1b35f6623c2a997ac816eb3d291fc..ff2dc06a9e903cfbb7cb6fbbb92263be82c4ecd6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -308,6 +308,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/patches/server/0071-Configurable-void-damage-height.patch b/patches/server/0071-Configurable-void-damage-height.patch index e4d9a6d1b..4458bf705 100644 --- a/patches/server/0071-Configurable-void-damage-height.patch +++ b/patches/server/0071-Configurable-void-damage-height.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 79f418054f91184b73759296cef15beb410edeae..982b00049149bba1c49bb2a0ecaed38ad4c4a267 100644 +index ff2dc06a9e903cfbb7cb6fbbb92263be82c4ecd6..80e03fbb7a875c9a45f8886623e97885e08101c9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -611,7 +611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/patches/server/0072-Dispenser-curse-of-binding-protection.patch b/patches/server/0072-Dispenser-curse-of-binding-protection.patch index 78eda71cc..1a1f73769 100644 --- a/patches/server/0072-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0072-Dispenser-curse-of-binding-protection.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Dispenser curse of binding protection diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 604cd36cf50a87e7bd9a39be728f46ccd099b2fc..1edc13647e0897541e9009e02e1510307e5f3a8f 100644 +index de891e39c02ac6fbb87044d31b3eeabac1e78865..c9791be9385c83c8ab626ff3661b0c6cb45822ad 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -995,6 +995,13 @@ public abstract class EntityInsentient extends EntityLiving { diff --git a/patches/server/0074-Add-obfhelpers-for-plugin-use.patch b/patches/server/0074-Add-obfhelpers-for-plugin-use.patch index 61bd86ce4..217ab639f 100644 --- a/patches/server/0074-Add-obfhelpers-for-plugin-use.patch +++ b/patches/server/0074-Add-obfhelpers-for-plugin-use.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add obfhelpers for plugin use diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 3adb29f004d2fee36f3ee9b21ee5417e84b64837..8c3d78f1ac30463b6592aaf65157e579f9ac87a3 100644 +index afa1dc693bc2e2e68294a1d3dec1c078ea95b286..7f3df9ba37076c0a982803148d21b0985f62f12c 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -639,6 +639,7 @@ public final class ItemStack { diff --git a/patches/server/0075-Mending-mends-most-damages-equipment-first.patch b/patches/server/0075-Mending-mends-most-damages-equipment-first.patch index 564fffbf5..e80aec9eb 100644 --- a/patches/server/0075-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0075-Mending-mends-most-damages-equipment-first.patch @@ -54,7 +54,7 @@ index c2be0c2bc315876f120cff207e5516dda2bd55d7..358d6d660581686a2e8d49e13e8c2ade if (entry != null) { ItemStack itemstack = (ItemStack) entry.getValue(); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 8c3d78f1ac30463b6592aaf65157e579f9ac87a3..c7931ff47498ba75b2cb29abccc6851e36109ce2 100644 +index 7f3df9ba37076c0a982803148d21b0985f62f12c..e747ee83f1a69a4a4bad87e720abc9b085fb6149 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -413,10 +413,19 @@ public final class ItemStack { diff --git a/patches/server/0076-Add-5-second-tps-average-in-tps.patch b/patches/server/0076-Add-5-second-tps-average-in-tps.patch index 1888e87b8..994de0937 100644 --- a/patches/server/0076-Add-5-second-tps-average-in-tps.patch +++ b/patches/server/0076-Add-5-second-tps-average-in-tps.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add 5 second tps average in /tps diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6b9199a3d42f9854a74e239c3f74230ca92dad1c..b87dab8fe6837338fad6d51d6c3134cee537f21b 100644 +index 942f556eca32ce13c6b3490ef0d6f9e960a36d06..e16f120544ad46995dcf695849d3634c575d65a5 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -162,7 +162,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant(this, EntityHuman.class, true)).a(300)); this.targetSelector.a(3, (new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)).a(300)); diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 60797203c0b2c8c3a7caaebe635d8f19d65ed104..4b524c2165e95a4d3d78b84b7b15416a4ea7d622 100644 +index c2144f78c24f015775a00b1c82de645e0e2c153a..ef08c9eb373c04690612157b97a72f7c5ca4d9dc 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -29,7 +29,7 @@ public abstract class EntityInsentient extends EntityLiving { @@ -2372,7 +2372,7 @@ index bdff2368836dca230a6622a205d5772834afc6ee..9ee03b233b71d1b4b85a9a5e1f0ea9fe float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index f1e1db97d611192ff2d4b635ef81cf592adde257..81e362c6e0b9e6dde5df3f9009ecc8fdc1943789 100644 +index c22fa35197ae23526a29bcbf69f3022ffc0701e1..618739799bc5dc2550198465b1e46e494f473ad9 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -462,7 +462,7 @@ public abstract class EntityLiving extends Entity { @@ -3211,7 +3211,7 @@ index a3a428da99574c485fcf2b8c7944e0d8354146ee..cf7de0127166f6175a6246062c8664e6 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5696bd0ce51acb45b57d84106e9b00bc041f548b..3c748cca91e5f83701e6ae83f76e7548dad35420 100644 +index ed8be7954fa42a241f370977f2862911b4d4395b..5767871fc8c26dc9d4c4489016740c75314f421c 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -508,6 +508,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -4333,7 +4333,7 @@ index ed6a47ad2fd973695fbb151d1a44000ec3639e54..ac75ed3e2e0e0cd8f91de9ff188e1735 Vec3D vec3d = new Vec3D(this.b - EntityVex.this.locX(), this.c - EntityVex.this.locY(), this.d - EntityVex.this.locZ()); double d0 = vec3d.f(); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 5d37cb14f9cb7e3a1491a3dbcf2129268572aa28..166a8f9a7fe9320f54276445fbfb04059ce18b8c 100644 +index a0bfef54c853d57c9a5c6d3f9f19591649295357..548a993a1de939396d075f9176e0d60eebc7b010 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -75,8 +75,19 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -4915,7 +4915,7 @@ index 9f5ce64a60fe7c312399ee416b11b84213dd3bee..b9f8ed355421f24306e0cc2bb976589f Entity entity1 = this.getShooter(); // Paper start - Cancel hit for vanished players diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index b87dab8fe6837338fad6d51d6c3134cee537f21b..37b7051e9fde2f0af9216dc5a755f74ec23bb1bd 100644 +index e16f120544ad46995dcf695849d3634c575d65a5..98961e20642e61239a6ad89445f97245aa821919 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1410,6 +1410,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1f73c9c919e5861b76955168691dc6bc0669ce9a..d92b8afe9d6471b66069527e8bd9a6ec370605ae 100644 +index 7e86d54f138523921bf069b75689af17252f2ae5..23d81518dfd76cd5174ba87afa0e9651cc55815a 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1369,7 +1369,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -30,7 +30,7 @@ index 1f73c9c919e5861b76955168691dc6bc0669ce9a..d92b8afe9d6471b66069527e8bd9a6ec this.inWater = false; } else if (this.a((Tag) TagsFluid.WATER, 0.014D)) { diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 6efe59e0385e144c59804e9e5e18e6910b1f6667..951e899e85c622d06bab7c4695366b8305d5b636 100644 +index e6de89e7f57c3c130dedb8407cd4cd577d394b9a..91df44d2e4f09fb612ae7bcb6c6a3dbb99aaba41 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -52,10 +52,12 @@ public class EntityArmorStand extends EntityLiving { diff --git a/patches/server/0171-Fix-stuck-in-portals.patch b/patches/server/0171-Fix-stuck-in-portals.patch index ba49566e3..c9ae375f3 100644 --- a/patches/server/0171-Fix-stuck-in-portals.patch +++ b/patches/server/0171-Fix-stuck-in-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix stuck in portals diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d92b8afe9d6471b66069527e8bd9a6ec370605ae..d6e51245ea2615d7db263c73757db74a5daaad8a 100644 +index 23d81518dfd76cd5174ba87afa0e9651cc55815a..16780df5c8768b05c88f82f3b869a77240b5c8a0 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -2419,12 +2419,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -25,7 +25,7 @@ index d92b8afe9d6471b66069527e8bd9a6ec370605ae..d6e51245ea2615d7db263c73757db74a this.inPortal = true; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 157300c0320a136d36994d463a69a5b0fe022683..fecf180cfbc7295f55380fc50e7ae18573443844 100644 +index 53125d7fc29e87f4bbf37ee77518222f6be1a4f4..13b745b333137ed4d71755a0fc7b5f3fb4ab972e 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1180,6 +1180,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {