Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.16.5

Browse Source
This commit is contained in:
BillyGalbreath
2021-01-15 21:03:49 -06:00
parent 22b876a304
commit ba42138259
68 changed files with 124 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 7232d8f2af...ce979b29be

7
README.md
View File

@@ -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
<dependency>
<groupId>net.pl3x.purpur</groupId>
<artifactId>purpur-api</artifactId>
<version>1.16.4-R0.1-SNAPSHOT</version>
<version>1.16.5-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
```
@@ -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")
}
```

2
build.gradle.kts
View File

@@ -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"

4
patches/api/0001-Tuinity-API-Changes.patch
View File

@@ -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
- <groupId>com.destroystokyo.paper</groupId>
- <artifactId>paper-api</artifactId>
+ <artifactId>tuinity-api</artifactId>
<version>1.16.4-R0.1-SNAPSHOT</version>
<version>1.16.5-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Paper-API</name>

34
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -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
- <artifactId>paper</artifactId>
+ <artifactId>tuinity</artifactId>
<packaging>jar</packaging>
<version>1.16.4-R0.1-SNAPSHOT</version>
<version>1.16.5-R0.1-SNAPSHOT</version>
- <name>Paper</name>
- <url>https://papermc.io</url>
+ <name>Tuinity-Server</name>
@@ -443,7 +443,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e
<properties>
<!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
@@ -18,16 +18,16 @@
@@ -19,16 +19,16 @@
</properties>
<parent>
@@ -464,7 +464,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -37,6 +37,13 @@
@@ -38,6 +38,13 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -478,7 +478,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e
<dependency>
<groupId>io.papermc</groupId>
<artifactId>minecraft-server</artifactId>
@@ -97,11 +104,7 @@
@@ -105,11 +112,7 @@
<artifactId>cleaner</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
@@ -491,7 +491,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e
<!-- deprecated API depend -->
<dependency>
<groupId>com.googlecode.json-simple</groupId>
@@ -141,6 +144,13 @@
@@ -149,6 +152,13 @@
<version>4.8.47</version>
<scope>test</scope>
</dependency>
@@ -505,7 +505,7 @@ index f641d2a79cbc38bc4ecffdbd8d1e1a5f9aa118f5..174c0b67c1c5b41d80613128ebf2d78e
</dependencies>
<repositories>
@@ -165,15 +175,15 @@
@@ -173,15 +183,15 @@
<!-- This builds a completely 'ready to start' jar with all dependencies inside -->
<build>
@@ -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 <T> void mergeSortedSets(final java.util.function.Consumer<T> consumer, final java.util.Comparator<? super T> comparator, final java.util.SortedSet<T>...sets) {
final ObjectRBTreeSet<T> 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<TickTas
@@ -14779,7 +14779,7 @@ index 0b40c2f4dada7d8432e3f91e9cf206c2bda3b24b..6eaf9fc9cc93f79a497b07a3549d459b
private int c;
private final Runnable d;
diff --git a/src/main/java/net/minecraft/server/VillagePlaceSection.java b/src/main/java/net/minecraft/server/VillagePlaceSection.java
index 77c66bc9952542d2444b402896a3d9f622ca2ff9..f43bc1f7d693d63c6bbdba976c048d2d0c8767b1 100644
index b86963aa34b5ae479f924c5a52afc5b5b66dba76..943a437ff27162eae09211c28bdc0d141fa6a404 100644
--- a/src/main/java/net/minecraft/server/VillagePlaceSection.java
+++ b/src/main/java/net/minecraft/server/VillagePlaceSection.java
@@ -23,12 +23,12 @@ public class VillagePlaceSection {
@@ -15542,7 +15542,7 @@ index f011869880fedae4b69e505491e8bdbc5f51dfba..0d10d317cd0b60fc0866ae505c7fd71f
return this.j.d();
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 136fe0d65bf6356d84be1b962383c8630e990d89..1774beea5a06214368f5df7be872bb830711568e 100644
index fbe7f43f6c1010e7a34114f8afb0e64934744335..6ff5ef6b710652f1c4fe6461ff230ee78988f623 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -55,12 +55,13 @@ import org.bukkit.event.server.MapInitializeEvent;
@@ -16432,7 +16432,7 @@ index dc7de2b59ec5ca3e5fba34dbb2aa2e6aed8f95cb..a383ba5e897101a3da1544c877148b43
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 0314cb1270803265dc4bf4268697b09aabf2c612..8904b39db2203118fe3589133cb7e64334c20f33 100644
index d86c25593db7cc0a73db1c37af94ae4e41bb4e93..f34e1570052eac83fb3e03b3e361d8d4f451abac 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -341,6 +341,14 @@ public class CraftWorld implements World {

8
patches/server/0002-Rebrand.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand
diff --git a/pom.xml b/pom.xml
index 174c0b67c1c5b41d80613128ebf2d78ee27f3cee..aafe4d0962d641866bb0f82728719c102c56fcc1 100644
index e83e4241a56fe131a75fe21cc1518992c089da2c..752d62eb3b87ab24260ec2c029bae0d2b0e3b908 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,8 +26,10 @@
@@ -27,8 +27,10 @@
<dependencies>
<dependency>
@@ -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<TickTas
@@ -195,7 +195,7 @@ index a383ba5e897101a3da1544c877148b43be7a6319..92bfae8f8249e70105fd848f01f950b6
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 0f7f1503d07bdff7ce7644dfe21e444adb52c7db..65a85f226822bb2b7f9a3a67654d3f40d7c4bfa2 100644
index 979f3504e6a6ca46993f3d9b0f408ab6744bdccd..568d2d78f5961098dfb8947d45ca26fd9334f151 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -353,7 +353,7 @@ public final class CraftMagicNumbers implements UnsafeValues {

2
patches/server/0003-Purpur-config-files.patch
View File

@@ -65,7 +65,7 @@ index ecff0657e5666ddc2e6a5c3111bfb2b8dd2b78d3..3ee8d31c453105eca7b96bede39a9ebb
// Paper end
com.tuinity.tuinity.config.TuinityConfig.init((java.io.File) options.valueOf("tuinity-settings")); // Tuinity - Server Config
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 9b35c8ad9efe9241fe442bc6ef2e9f62def386d8..2c4c13b30b4533f5476f1128317d477ad8001bf5 100644
index de9ea6770b8afc5e1020bef04ac6cca93b6b420c..21d0570a59240e955ff148bac0226b220a7dec36 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -166,7 +166,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

6
patches/server/0009-AFK-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 3ef463e1313b9729c86437f499930ab4cd332a6d..7880c329942ff96acd1d9c713c5484107c0d660f 100644
index 9796b4e57d6680c9f0dc76decdd985572daafb7e..f15ec5c45d95c6828ed628451917ac3426a76f1f 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -84,6 +84,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -25,7 +25,7 @@ index 3ef463e1313b9729c86437f499930ab4cd332a6d..7880c329942ff96acd1d9c713c548410
super(EntityTypes.PLAYER, world);
this.bL = ItemStack.b;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 40f56858143651bb0addd0b74db7388ecbe56521..82b975dd483b55461df0e110add5546a7815c650 100644
index 9f5b7243ccbe0729a061345c25033d9145b91b3f..dc69cba40806782e0b8ffd3b77aa6298feddb35d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1904,8 +1904,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -193,7 +193,7 @@ index 5c708ed2cd3b10744b0d6d2eb2ef51d0411ce0dc..d1d4f4baf33e6b2224116f22a63b6d21
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 1774beea5a06214368f5df7be872bb830711568e..6a58b368b9397a5e529cf4e1e532ca30ed312fb5 100644
index 6ff5ef6b710652f1c4fe6461ff230ee78988f623..efe2a9ad2ece23bd71f4ad63b2c6f54f42345b55 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -781,7 +781,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0011-Configurable-server-mod-name.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable server mod name
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 717978668d0706e5ec30f0a22d7e52fd80fdd348..e537b9720aa2988bf4740fc9c2c9c5c8b09df292 100644
index af5c1479d2cb8092d84e2d3d5166060d9ff2df71..90556fca9315e71c4f3fbd231ac6d765677ca271 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<TickTas

4
patches/server/0012-LivingEntity-safeFallDistance.patch
View File

@@ -17,7 +17,7 @@ index 702242653a47051c9ed32304c427c27652af6157..9f4f56c47ecd4b35ebf33ca0bf9a0400
@Override
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index fcb31147622b4b81934be05ffc8de5e821ce69b7..ce26e65aaf25a41663ecd8c935967c33ff3de1dc 100644
index 2a91f07ca9c4dc0cb3b5aef5c9c1db7f69773530..7604fd83de9cfe93d427a9a1f6bbbee76aa861e8 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -210,7 +210,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -30,7 +30,7 @@ index fcb31147622b4b81934be05ffc8de5e821ce69b7..ce26e65aaf25a41663ecd8c935967c33
protected int getChestSlots() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 1c396ec56f35d8764e3bf7b67a7984393eb94b3b..94585029142f8d8c494cf957d5363a0aec0b697d 100644
index 4fe5a8d0201d662c68dd58eeb8cf1d304787edb4..279662570c0bbd6c00b5732881cd35dfe694b25d 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -132,6 +132,7 @@ public abstract class EntityLiving extends Entity {

2
patches/server/0013-Lagging-threshold.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e537b9720aa2988bf4740fc9c2c9c5c8b09df292..ff6ed0a8e055eaf73249d8c2d0f69a29c2067f61 100644
index 90556fca9315e71c4f3fbd231ac6d765677ca271..e12fecf47798f638b85e7c6d54055a526097811c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -163,6 +163,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

6
patches/server/0017-EntityMoveEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] EntityMoveEvent
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 94585029142f8d8c494cf957d5363a0aec0b697d..144c443f6f8b7ab2c6df2d32c27ef8bed21ce9dd 100644
index 279662570c0bbd6c00b5732881cd35dfe694b25d..50cb2551598101d1c12007c53421b6c2f59ce2aa 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2813,6 +2813,20 @@ public abstract class EntityLiving extends Entity {
@@ -30,7 +30,7 @@ index 94585029142f8d8c494cf957d5363a0aec0b697d..144c443f6f8b7ab2c6df2d32c27ef8be
this.damageEntity(DamageSource.DROWN, 1.0F);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index ff6ed0a8e055eaf73249d8c2d0f69a29c2067f61..a3fb9cc93a759074e2ae987dd48a1361d64d60c1 100644
index e12fecf47798f638b85e7c6d54055a526097811c..d79cf993cdadfe7fadd6c7e65b9fc691a298c702 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1398,6 +1398,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -42,7 +42,7 @@ index ff6ed0a8e055eaf73249d8c2d0f69a29c2067f61..a3fb9cc93a759074e2ae987dd48a1361
this.methodProfiler.a(() -> {
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 {

2
patches/server/0018-Player-invulnerabilities.patch
View File

@@ -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 {

2
patches/server/0020-Configurable-villager-brain-ticks.patch
View File

@@ -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

6
patches/server/0027-Giants-AI-settings.patch
View File

@@ -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 {

2
patches/server/0029-Zombie-horse-naturally-spawn.patch
View File

@@ -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 {

2
patches/server/0038-Add-option-to-set-armorstand-step-height.patch
View File

@@ -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 {

4
patches/server/0041-Cows-eat-mushrooms.patch
View File

@@ -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 {

2
patches/server/0048-Signs-allow-color-codes.patch
View File

@@ -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 {

4
patches/server/0050-Controllable-Minecarts.patch
View File

@@ -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 {

2
patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch
View File

@@ -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 {

2
patches/server/0052-Players-should-not-cram-to-death.patch
View File

@@ -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 {

4
patches/server/0055-Fix-the-dead-lagging-the-server.patch
View File

@@ -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 {

2
patches/server/0059-Configurable-TPS-Catchup.patch
View File

@@ -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<TickTas

2
patches/server/0062-Entities-pick-up-loot-bypass-mob-griefing-gamerule.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities pick up loot bypass mob-griefing gamerule
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index dfedabaeb88b66420db39380fa824cee2d45687b..7dc165f5150c9143c1b475002a3b79034309c5b9 100644
index 7d9027d881e6e3eb0d1f8478ac7a1501dc5dec1d..72d07fd593dd9459b3ce1c238a02f3839d2e097b 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -545,7 +545,7 @@ public abstract class EntityInsentient extends EntityLiving {

2
patches/server/0064-Villagers-follow-emerald-blocks.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Villagers follow emerald blocks
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 171e8553a339eb3c995369f274de86b824183ca6..0ab7d3441bcafae9874134c7832a4b7c98bc5e64 100644
index c034869310ca3dadbfe5425c45aaa80dac59ac88..1cde71b812c7721298e7addb74de01e4ea297499 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -74,6 +74,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

4
patches/server/0065-Allow-leashing-villagers.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 7dc165f5150c9143c1b475002a3b79034309c5b9..604cd36cf50a87e7bd9a39be728f46ccd099b2fc 100644
index 72d07fd593dd9459b3ce1c238a02f3839d2e097b..de891e39c02ac6fbb87044d31b3eeabac1e78865 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1146,6 +1146,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index 7dc165f5150c9143c1b475002a3b79034309c5b9..604cd36cf50a87e7bd9a39be728f46cc
if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) {
((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder()));
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 0ab7d3441bcafae9874134c7832a4b7c98bc5e64..3c457c8962bd9e63ae81f3d4e0f172adb5b35b77 100644
index 1cde71b812c7721298e7addb74de01e4ea297499..e4aedb3df5d0a47b5bb9175627aa794fc1779639 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -79,6 +79,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

2
patches/server/0066-Implement-configurable-search-radius-for-villagers-t.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 3c457c8962bd9e63ae81f3d4e0f172adb5b35b77..894089d665e97da31c04c82aaae344b22f83de89 100644
index e4aedb3df5d0a47b5bb9175627aa794fc1779639..c06425434c97645b914c07940528901a2979ce1b 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -894,6 +894,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

2
patches/server/0069-Add-player-death-exp-control-options.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add player death exp control options
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 7880c329942ff96acd1d9c713c5484107c0d660f..96662fce02193496b4d91578d355932493d8e31e 100644
index f15ec5c45d95c6828ed628451917ac3426a76f1f..0ef020972494181a87c86f95aec7a4302e243f16 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -85,6 +85,8 @@ public abstract class EntityHuman extends EntityLiving {

2
patches/server/0070-Add-canSaveToDisk-to-Entity.patch
View File

@@ -17,7 +17,7 @@ index 090e5eafeb35c60fb470b74863d59ed4a4f66be8..fc0bb651878633f778623e9b91ba110b
final int saveLimit = worldserver.paperConfig.entityPerChunkSaveLimits.getOrDefault(entityType, -1);
if (saveLimit > -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

2
patches/server/0071-Configurable-void-damage-height.patch
View File

@@ -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

2
patches/server/0072-Dispenser-curse-of-binding-protection.patch
View File

@@ -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 {

2
patches/server/0074-Add-obfhelpers-for-plugin-use.patch
View File

@@ -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 {

2
patches/server/0075-Mending-mends-most-damages-equipment-first.patch
View File

@@ -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 {

2
patches/server/0076-Add-5-second-tps-average-in-tps.patch
View File

@@ -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<TickTas

4
patches/server/0077-Implement-elytra-settings.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement elytra settings
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 435726651ada6ccb4bbd31fe21a439d29f131098..be5f2147e9cded85620a57a90c7d800262fc3d6e 100644
index 9b1ecf6101e146843b4d2eeabc3e0e3c4fde54b5..82ef4c9c534f4a0840a61d33c7727bd4770c7511 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2851,7 +2851,16 @@ public abstract class EntityLiving extends Entity {
@@ -46,7 +46,7 @@ index e775fe69ee7e555721bc73e7cb0dd3136736bc9c..990eb656699d9ead26b42fbb305530b7
itemstack.subtract(1);
} else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index c7931ff47498ba75b2cb29abccc6851e36109ce2..f5802f14b84a5b177ddbdb53a6c3ce892ef310f6 100644
index e747ee83f1a69a4a4bad87e720abc9b085fb6149..a4edfb02fd350433020b0f3699726b6127ab9933 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -445,7 +445,7 @@ public final class ItemStack {

2
patches/server/0078-Item-entity-immunities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 982b00049149bba1c49bb2a0ecaed38ad4c4a267..929b909f05fa226ea3305671a7932475c8ce1837 100644
index 80e03fbb7a875c9a45f8886623e97885e08101c9..2d3146561c0ec3777eec11f6618cd2a3fa34d6d6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1481,6 +1481,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0081-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -17,7 +17,7 @@ index 6fe5678cffc2487fe00c953d772f764bb37a4b11..bd0267ee4b3782f6d1ec39cba7966ba4
return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 929b909f05fa226ea3305671a7932475c8ce1837..36e92f884ea5af69798c9b305b7aaf021da4bf04 100644
index 2d3146561c0ec3777eec11f6618cd2a3fa34d6d6..793977e76752d853d2280ccf5d1f4709463ab526 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2146,8 +2146,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0087-Entity-lifespan.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity lifespan
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 1edc13647e0897541e9009e02e1510307e5f3a8f..60797203c0b2c8c3a7caaebe635d8f19d65ed104 100644
index c9791be9385c83c8ab626ff3661b0c6cb45822ad..c2144f78c24f015775a00b1c82de645e0e2c153a 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -53,7 +53,7 @@ public abstract class EntityInsentient extends EntityLiving {

4
patches/server/0088-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index be5f2147e9cded85620a57a90c7d800262fc3d6e..699afb9759083b42fd0608a3417fd3d17ce8f560 100644
index 82ef4c9c534f4a0840a61d33c7727bd4770c7511..bfbe9b82c14a525bffa96a8dfa071e8805ce6006 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -280,6 +280,7 @@ public abstract class EntityLiving extends Entity {
@@ -17,7 +17,7 @@ index be5f2147e9cded85620a57a90c7d800262fc3d6e..699afb9759083b42fd0608a3417fd3d1
}
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index a86e29ff086a4fe8aa4e8395ba420c0aff8f0be0..4134d9a1e649c70164a28df615bb43e81e7a64d6 100644
index ff4e60e321e0df7d43078ae0899b9e08717ad9b3..994e17f874696d7a410d2c308efe060d4894c705 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -2389,4 +2389,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

2
patches/server/0093-Configurable-villager-breeding.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable villager breeding
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 894089d665e97da31c04c82aaae344b22f83de89..5d37cb14f9cb7e3a1491a3dbcf2129268572aa28 100644
index c06425434c97645b914c07940528901a2979ce1b..a0bfef54c853d57c9a5c6d3f9f19591649295357 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -642,7 +642,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

2
patches/server/0095-Totems-work-in-inventory.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Totems work in inventory
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 699afb9759083b42fd0608a3417fd3d17ce8f560..f1e1db97d611192ff2d4b635ef81cf592adde257 100644
index bfbe9b82c14a525bffa96a8dfa071e8805ce6006..c22fa35197ae23526a29bcbf69f3022ffc0701e1 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1327,6 +1327,19 @@ public abstract class EntityLiving extends Entity {

2
patches/server/0096-Fix-death-message-colors.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix death message colors
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 4134d9a1e649c70164a28df615bb43e81e7a64d6..5696bd0ce51acb45b57d84106e9b00bc041f548b 100644
index 994e17f874696d7a410d2c308efe060d4894c705..ed8be7954fa42a241f370977f2862911b4d4395b 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -852,7 +852,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

2
patches/server/0102-Dispensers-place-anvils-option.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Dispensers place anvils option
diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
index c9963c19892c3e408964b72983bc6e26f8b63b67..e3ba447eb7f3023406b71aab97e3d30523540588 100644
index 24e6f3141ff4434f770e956a8d240bf856442933..c187f04ef657e9012d2fcdc2fd5b4cca69d78c3f 100644
--- a/src/main/java/net/minecraft/server/EnumDirection.java
+++ b/src/main/java/net/minecraft/server/EnumDirection.java
@@ -102,6 +102,7 @@ public enum EnumDirection implements INamable {

2
patches/server/0104-Add-no-tick-block-list.patch
View File

@@ -22,7 +22,7 @@ index 829d4a7508e1656dbdc912096b7eafcf30cbb5b2..6aea156d7c7a9ca8a357aad6a6781d72
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 689504bb79de406c783a0fb926ed1366cbd213e1..437ab11826d12d743d74f0161ba796b006632c3c 100644
index 2f41a537fb1d8348b5f65a3e85da841761311744..d5007d00da9a10e99d7fa46a4368d41fb421ac31 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -321,14 +321,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0107-Stop-squids-floating-on-top-of-water.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 36e92f884ea5af69798c9b305b7aaf021da4bf04..247d6d425ca60751fac78e5316449a326b11703d 100644
index 793977e76752d853d2280ccf5d1f4709463ab526..49020e7d719af5e688a23b35af8c57fdd6934d04 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3456,8 +3456,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

20
patches/server/0108-Ridables.patch
View File

@@ -161,7 +161,7 @@ index bd0267ee4b3782f6d1ec39cba7966ba4f62f1adf..8b36ac2b0950a827763aa2357700f37e
this.B = true;
return this;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 247d6d425ca60751fac78e5316449a326b11703d..52325b6f212455dd19c7ee5b2d85a85f2d077418 100644
index 49020e7d719af5e688a23b35af8c57fdd6934d04..5b4bb8876bd5877aaa2ed6a40c05fb0c2188b444 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1979,7 +1979,7 @@ index f6797925365836b6c2d3d2c48c746a4d58e28bf3..548ff4449faca0abdf72487276fe4920
@Override
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
index e0e60bb6d853e27a3495a8de9018e547a68ff726..0415a4d1f328f117ee676156114acb3599aec202 100644
index f958751b16abcc36910bb0b655ff2360459e2e4c..4ffc61acdff8c51dc9b111e3024c828fb5386118 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -12,6 +12,13 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -1997,7 +1997,7 @@ index e0e60bb6d853e27a3495a8de9018e547a68ff726..0415a4d1f328f117ee676156114acb35
protected void eK() {
this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue((double) this.fp());
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index ce26e65aaf25a41663ecd8c935967c33ff3de1dc..bb3ebf70f460c459defda833d6f40026321ad638 100644
index 7604fd83de9cfe93d427a9a1f6bbbee76aa861e8..7958b69b2d4bee87ff5b38b8f724d248f41dff66 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -39,12 +39,27 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -2143,7 +2143,7 @@ index 0e98173607c810e0e74552a2ba8febf292357c39..559ba50977147b8e2a0e7c1e7dc281fa
+ protected void eV() { if (world.purpurConfig.zombieHorseCanSwim) goalSelector.a(0, new PathfinderGoalFloat(this)); } // Purpur
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 96662fce02193496b4d91578d355932493d8e31e..9963cef9298eb6d3e2ee6a24d9b1998e765123ac 100644
index 0ef020972494181a87c86f95aec7a4302e243f16..aef1dc47f2025f09d650a04f6dfa867d5ea1b65a 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -2155,4 +2155,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -2200,7 +2200,7 @@ index c57bf5091430709778dc21d70c8a32819c9d6639..b0a5c36d1132e2558a1fefbd9f8dd264
this.targetSelector.a(2, (new PathfinderGoalNearestAttackableTarget<>(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<TickTas
@@ -5041,7 +5041,7 @@ index f260d01aad4db512952e5a53bf5bc01023bbd43d..cf1f4fe5832781df7d0bdd5eb24eff85
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 437ab11826d12d743d74f0161ba796b006632c3c..d06c47484ea073695f8135a42c7985bfbafd6b9c 100644
index d5007d00da9a10e99d7fa46a4368d41fb421ac31..79ae47ffafae09059774e45b48a36818e104b036 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -102,6 +102,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0111-Entities-can-use-portals-configuration.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 52325b6f212455dd19c7ee5b2d85a85f2d077418..d75d34700e7017b3d09f01f2e05ac1aaec09fa70 100644
index 5b4bb8876bd5877aaa2ed6a40c05fb0c2188b444..301261f720df8f337b6889c6253e5c4dae91b6e4 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2422,7 +2422,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0114-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -42,7 +42,7 @@ index cf1f4fe5832781df7d0bdd5eb24eff8539691c30..aa1b037c0103552761b81318f1d2ad82
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d06c47484ea073695f8135a42c7985bfbafd6b9c..4fa3d50b4f9f2623ca9265db9afb9a36548b5753 100644
index 79ae47ffafae09059774e45b48a36818e104b036..7ee7975d5569d24c836018e240ebd785a9e8fed5 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -339,7 +339,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {

4
patches/server/0116-Despawn-rate-config-options-per-projectile-type.patch
View File

@@ -112,7 +112,7 @@ index a646dc9f030ad1f76ba2b7bb1bc7897cd34b648c..9789d480ad2b6da6874004c068a298ed
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index 519df0002be34da47ea967e5c0d2cf828c166df8..6891e61bcfea82958e100abaef94865bf36a32c2 100644
index e97c7794e86c0518bcec0a0370bffbeab20e2623..7fcee87cdcd15a17b9019fa40f30cae688272294 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -576,4 +576,11 @@ public class EntityFishingHook extends IProjectile {
@@ -160,7 +160,7 @@ index 7636a51a7ef0aa05b5b2aaa9d17e7b551dedac96..3e6438c9778ec6c9f62ac74d97fb5108
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityPotion.java b/src/main/java/net/minecraft/server/EntityPotion.java
index d57da221c103ceb7e635dfbaf4cedff1cd9612ed..6d4b1e58dfd6c9654e5ab91fffcda82994d3714e 100644
index ddf1f80f3ba45e09cd13ca646a8ec6e8d47be555..bd84a3ac6146cfe6952a9334820696b4583b45b5 100644
--- a/src/main/java/net/minecraft/server/EntityPotion.java
+++ b/src/main/java/net/minecraft/server/EntityPotion.java
@@ -240,4 +240,11 @@ public class EntityPotion extends EntityProjectileThrowable {

2
patches/server/0119-Persistent-TileEntity-Lore-and-DisplayName.patch
View File

@@ -79,7 +79,7 @@ index d621b11ba9029a732a819e0558d6f8a439990dbe..c276a2896ba73d86e7e18d656903b36d
if (!world.isClientSide && !itemstack.isEmpty() && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
float f = 0.5F;
diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
index bbb1de7d1adce6e986467db234b27518df4dd87f..d97efe3d4765dcae50afae49d252e710c056337f 100644
index 9d62bc6d600526881dccb44d158e30f565078cec..b8c71925a6e4c58fcefba0ab38270aaa236aabba 100644
--- a/src/main/java/net/minecraft/server/ItemBlock.java
+++ b/src/main/java/net/minecraft/server/ItemBlock.java
@@ -96,7 +96,24 @@ public class ItemBlock extends Item {

2
patches/server/0124-Configurable-daylight-cycle.patch
View File

@@ -18,7 +18,7 @@ index 1b9b43ee696575d986c25cafec07d863acb951a7..e837db171545ceacbc84a2b360cf0d95
public PacketPlayOutUpdateTime() {}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 4fa3d50b4f9f2623ca9265db9afb9a36548b5753..802460402d546262fc50a07901b1d30d9a7bbd7b 100644
index 7ee7975d5569d24c836018e240ebd785a9e8fed5..6d5616dc4a899a1c01a21daece17f1c2cf0411bd 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -94,6 +94,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0128-Add-tablist-suffix-option-for-afk.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add tablist suffix option for afk
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 3c748cca91e5f83701e6ae83f76e7548dad35420..d677b4477a871790377348a112fa267181a70cda 100644
index 5767871fc8c26dc9d4c4489016740c75314f421c..d01dd1b4b561cda65c247d7775b7e8e1e503cbda 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1972,7 +1972,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

2
patches/server/0131-Make-animal-breeding-times-configurable.patch
View File

@@ -126,7 +126,7 @@ index 548ff4449faca0abdf72487276fe49207bacfe17..a1578aade4a535144b5e40277c902f2e
@Override
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
index 0415a4d1f328f117ee676156114acb3599aec202..b19995f962180a44ff388d58a26cc5782d0826e4 100644
index 4ffc61acdff8c51dc9b111e3024c828fb5386118..669bce5d9806c80bddc247fe103ff20dc6aaa8a5 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -17,6 +17,11 @@ public class EntityHorse extends EntityHorseAbstract {

8
patches/server/0132-Apply-display-names-from-item-forms-of-entities-to-e.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Apply display names from item forms of entities to entities
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index faa221038df6bed02a2433855ed7c7e0f89c6024..6efe59e0385e144c59804e9e5e18e6910b1f6667 100644
index 41a36ce6d446b78bdd7a4739ad372a2ee19da116..e6de89e7f57c3c130dedb8407cd4cd577d394b9a 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -553,7 +553,13 @@ public class EntityArmorStand extends EntityLiving {
@@ -44,7 +44,7 @@ index 4f95976f9a852fa89cedd1fe81d2077fe5d118ee..0254a9e971b2dd93436a38815bfd1dcc
this.die();
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 4b524c2165e95a4d3d78b84b7b15416a4ea7d622..d1ed9856d3362e1bed37d60c268b7e91c404d25d 100644
index ef08c9eb373c04690612157b97a72f7c5ca4d9dc..475741612979fa16dd29df3aea9764d501be988a 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1367,7 +1367,13 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -78,7 +78,7 @@ index 4b524c2165e95a4d3d78b84b7b15416a4ea7d622..d1ed9856d3362e1bed37d60c268b7e91
}
}
diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java
index 661db537f6ac2b5a80e2e40a25966a2e3039199d..a43a42aa696994a17dda790d01d09e0abdaade00 100644
index 8a95e698d5caa3730954ce1135b0ec37a389dd70..372be937f1cf95775e37931f326f6a77836968f3 100644
--- a/src/main/java/net/minecraft/server/EntityItemFrame.java
+++ b/src/main/java/net/minecraft/server/EntityItemFrame.java
@@ -199,7 +199,13 @@ public class EntityItemFrame extends EntityHanging {
@@ -176,7 +176,7 @@ index a3eaeeda875d96fe4b047bd6bf993018722c96b9..f2f800087adb0238b4b672b9f6f4c8c4
if (((EntityHanging) object).survives()) {
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index f5802f14b84a5b177ddbdb53a6c3ce892ef310f6..d65375f8849dcbcad4f0fbc456a005247145c724 100644
index a4edfb02fd350433020b0f3699726b6127ab9933..3f9062d8eca3ce53c0fb9e9e40330aa4e3296c9a 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -733,6 +733,7 @@ public final class ItemStack {

2
patches/server/0137-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add critical hit check to EntityDamagedByEntityEvent
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 9963cef9298eb6d3e2ee6a24d9b1998e765123ac..a72ce4ea5a45fce35a47fd5f9c21b9500adbe265 100644
index aef1dc47f2025f09d650a04f6dfa867d5ea1b65a..c973a1f1aecd47f11a12c94325cc18c3307d7ab5 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -73,6 +73,7 @@ public abstract class EntityHuman extends EntityLiving {

2
patches/server/0143-Changeable-Mob-Left-Handed-Chance.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Changeable Mob Left Handed Chance
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index d1ed9856d3362e1bed37d60c268b7e91c404d25d..d7ceb4ff6aa424d620817ddcc9201fc09aaaad16 100644
index 475741612979fa16dd29df3aea9764d501be988a..947c9fb574f111e3edfadab3c3e120b8451e1c25 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1136,7 +1136,7 @@ public abstract class EntityInsentient extends EntityLiving {

2
patches/server/0144-Add-boat-fall-damage-config.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index d677b4477a871790377348a112fa267181a70cda..157300c0320a136d36994d463a69a5b0fe022683 100644
index d01dd1b4b561cda65c247d7775b7e8e1e503cbda..53125d7fc29e87f4bbf37ee77518222f6be1a4f4 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1030,7 +1030,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

4
patches/server/0150-Lobotomize-stuck-villagers.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d75d34700e7017b3d09f01f2e05ac1aaec09fa70..1f73c9c919e5861b76955168691dc6bc0669ce9a 100644
index 301261f720df8f337b6889c6253e5c4dae91b6e4..7e86d54f138523921bf069b75689af17252f2ae5 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -114,7 +114,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index d75d34700e7017b3d09f01f2e05ac1aaec09fa70..1f73c9c919e5861b76955168691dc6bc
public float yaw;
public float pitch;
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 166a8f9a7fe9320f54276445fbfb04059ce18b8c..70d9cd5c251402bdbfb70b2c90dfe24151d3149a 100644
index 548a993a1de939396d075f9176e0d60eebc7b010..b3f71c9dcada0ae14172c5694564a9f54a6e556e 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -187,15 +187,37 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

2
patches/server/0151-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -133,7 +133,7 @@ index 2d91869660c36b4cd7bfe887956a26802cce7f8a..e376306bc2555620d1a61af2296f3dd8
} else {
object = new BehaviorWork();
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index 70d9cd5c251402bdbfb70b2c90dfe24151d3149a..ddfbc18722a18f534eb6e3a1a1bf5035102b0d94 100644
index b3f71c9dcada0ae14172c5694564a9f54a6e556e..60962553e4f374b38de82f2cd4d72cef3d956c72 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -131,7 +131,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

2
patches/server/0154-Configurable-chance-for-wolves-to-spawn-rabid.patch
View File

@@ -7,7 +7,7 @@ Configurable chance to spawn a wolf that is rabid.
Rabid wolves attack all players, mobs, and animals.
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 81e362c6e0b9e6dde5df3f9009ecc8fdc1943789..60216266e9b18871b7b00be55805bce191e2105b 100644
index 618739799bc5dc2550198465b1e46e494f473ad9..3836d772d07efb7e9a9e7ecc7141330f0cd15801 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2094,6 +2094,7 @@ public abstract class EntityLiving extends Entity {

6
patches/server/0156-Configurable-entity-base-attributes.patch
View File

@@ -332,7 +332,7 @@ index a1578aade4a535144b5e40277c902f2e9ab9e940..4a3469aca9f9e47d2ea3f3bae6ce77f5
@Override
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
index b19995f962180a44ff388d58a26cc5782d0826e4..005281dbced10fa72ccd62ce63193f91824deaf7 100644
index 669bce5d9806c80bddc247fe103ff20dc6aaa8a5..e78e89d187f923239f23e37d5141e2e69b056360 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java
+++ b/src/main/java/net/minecraft/server/EntityHorse.java
@@ -22,6 +22,21 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -358,7 +358,7 @@ index b19995f962180a44ff388d58a26cc5782d0826e4..005281dbced10fa72ccd62ce63193f91
@Override
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index bb3ebf70f460c459defda833d6f40026321ad638..4391601b8a9e0b50240e70e85c8084b1762bf716 100644
index 7958b69b2d4bee87ff5b38b8f724d248f41dff66..645431cccc8f852fd87f2b3095fd4b19bc480345 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -55,6 +55,32 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -1149,7 +1149,7 @@ index ac75ed3e2e0e0cd8f91de9ff188e173591443b72..af85dcc824e4ad50eca2ccd957da7b68
@Override
diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
index ddfbc18722a18f534eb6e3a1a1bf5035102b0d94..08edab66c18200dfea29b52e2825af94119a3415 100644
index 60962553e4f374b38de82f2cd4d72cef3d956c72..eef51f8e5734b897164ca9514e7b49b2678416e6 100644
--- a/src/main/java/net/minecraft/server/EntityVillager.java
+++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -95,6 +95,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation

2
patches/server/0159-Implement-TPSBar.patch
View File

@@ -17,7 +17,7 @@ index b5cc099746e9f05ea69bc438bda22a5ac3ebc3c5..bbd17231a4f7ad0ddde6eb5e589a6c40
if (commanddispatcher_servertype.d) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 37b7051e9fde2f0af9216dc5a755f74ec23bb1bd..72df524d83139a7bf3c79fe5e403290fc457e12d 100644
index 98961e20642e61239a6ad89445f97245aa821919..760799782d0cb01e2b14408a9b085f78034ec78d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -468,6 +468,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

2
patches/server/0162-Full-netherite-armor-grants-fire-resistance.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Full netherite armor grants fire resistance
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index a72ce4ea5a45fce35a47fd5f9c21b9500adbe265..d9d7a5df16ae9854a69103a936de89b2086e9465 100644
index c973a1f1aecd47f11a12c94325cc18c3307d7ab5..91c2756a8708a2f4154905baec20b9ae484fea0d 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -236,6 +236,16 @@ public abstract class EntityHuman extends EntityLiving {

19
patches/server/0163-Fix-rotating-UP-DOWN-CW-and-CCW.patch
View File

@@ -4,25 +4,8 @@ Date: Wed, 6 Jan 2021 02:19:29 -0600
Subject: [PATCH] Fix rotating UP/DOWN CW and CCW
diff --git a/src/main/java/net/minecraft/server/BlockFireAbstract.java b/src/main/java/net/minecraft/server/BlockFireAbstract.java
index 9c42b5df5839ed1759391270bcc6f240388ddd04..172e4b3eeecc3808a335b80bb44bc6be3d8dd33d 100644
--- a/src/main/java/net/minecraft/server/BlockFireAbstract.java
+++ b/src/main/java/net/minecraft/server/BlockFireAbstract.java
@@ -93,12 +93,6 @@ public abstract class BlockFireAbstract extends Block {
}
private static boolean b(World world, BlockPosition blockposition, EnumDirection enumdirection) {
- // CraftBukkit start - SPIGOT-6311: Do not calculate portals for up/down directions
- if (enumdirection == EnumDirection.UP || enumdirection == EnumDirection.DOWN) {
- return false;
- }
- // CraftBukkit end
-
if (!a(world)) {
return false;
} else {
diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
index e3ba447eb7f3023406b71aab97e3d30523540588..83366996a0f9ae4684cc5424ace7630cc72b75f7 100644
index c187f04ef657e9012d2fcdc2fd5b4cca69d78c3f..a660033af081cef69e4646c9ed9eaa66cf90217f 100644
--- a/src/main/java/net/minecraft/server/EnumDirection.java
+++ b/src/main/java/net/minecraft/server/EnumDirection.java
@@ -113,6 +113,12 @@ public enum EnumDirection implements INamable {

6
patches/server/0165-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Add mobGriefing bypass to everything affected
This adds the "bypass-mob-griefing" world config option to everything that is affected by the gamerule.
diff --git a/src/main/java/net/minecraft/server/BlockCampfire.java b/src/main/java/net/minecraft/server/BlockCampfire.java
index 7b37bb1a3f9d274acfb49f6708927e9b2ea6bdeb..331c9d55f685b25331349d01091b446894363530 100644
index 99decab11b3561edb0fea8964bfb97ccc997b772..e4cc567d28a5368f975e29c7d18dba007d914584 100644
--- a/src/main/java/net/minecraft/server/BlockCampfire.java
+++ b/src/main/java/net/minecraft/server/BlockCampfire.java
@@ -139,7 +139,7 @@ public class BlockCampfire extends BlockTileEntity implements IBlockWaterlogged
@@ -16,7 +16,7 @@ index 7b37bb1a3f9d274acfb49f6708927e9b2ea6bdeb..331c9d55f685b25331349d01091b4468
- boolean flag = entity == null || entity instanceof EntityHuman || world.getGameRules().getBoolean(GameRules.MOB_GRIEFING);
+ boolean flag = entity == null || entity instanceof EntityHuman || world.purpurConfig.fireballsBypassMobGriefing || world.getGameRules().getBoolean(GameRules.MOB_GRIEFING); // Purpur
if (flag && !(Boolean) iblockdata.get(BlockCampfire.b) && !(Boolean) iblockdata.get(BlockCampfire.d)) {
if (flag && !(Boolean) iblockdata.get(BlockCampfire.LIT) && !(Boolean) iblockdata.get(BlockCampfire.d)) {
BlockPosition blockposition = movingobjectpositionblock.getBlockPosition();
diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
index 0fdc960fa3bbe6506185480a7a86d5009d70b385..d49c309d7c31b3be0a21544ba23c0fd663f3317b 100644
@@ -146,7 +146,7 @@ index d12de20cf4bb2345c616d3cc0b9f50bddb5135ee..3f3be1b2ded6ad118ae7860c1231c7af
// CraftBukkit start - fire ExplosionPrimeEvent
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 60216266e9b18871b7b00be55805bce191e2105b..58d988d3722b3b452ccf2daf40dd3d486dbc7b48 100644
index 3836d772d07efb7e9a9e7ecc7141330f0cd15801..8bceb152d9c7a3227c4bd3bb47964cf69abea0b4 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1472,7 +1472,7 @@ public abstract class EntityLiving extends Entity {

4
patches/server/0170-Movement-options-for-armour-stands.patch
View File

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
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 {

4
patches/server/0171-Fix-stuck-in-portals.patch
View File

@@ -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 {