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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
9a129fa99 Add #getEligibleHumans to SkeletonHorseTrapEvent
b5e23c7a6 Fix merging spawning values
a932e8ad7 Turn off spigot verbose world by default
8ced89f65 Fix Delegation to vanilla chunk gen
This commit is contained in:
BillyGalbreath
2020-12-05 21:44:46 -06:00
parent 6cd244c701
commit cea486c6a7
170 changed files with 84 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8761,10 +8761,10 @@ index 25e54a1fad..cce0ac8a36 100644
return this.d(entity, axisalignedbb, predicate).allMatch(VoxelShape::isEmpty);
} finally { if (entity != null) entity.collisionLoadChunks = false; } // Paper
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 07dbdd5609..40ca3364d4 100644
index 2639c17b7f..cbaf18af10 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -52,16 +52,26 @@ public interface IEntityAccess {
@@ -55,16 +55,26 @@ public interface IEntityAccess {
return this.b(oclass, axisalignedbb, IEntitySelector.g);
}
@@ -8793,7 +8793,7 @@ index 07dbdd5609..40ca3364d4 100644
label25:
{
if (entity == null) {
@@ -79,7 +89,7 @@ public interface IEntityAccess {
@@ -82,7 +92,7 @@ public interface IEntityAccess {
flag = false;
return flag;
@@ -8802,7 +8802,7 @@ index 07dbdd5609..40ca3364d4 100644
}
}
@@ -179,12 +189,12 @@ public interface IEntityAccess {
@@ -204,12 +214,12 @@ public interface IEntityAccess {
}
@Nullable
@@ -14676,7 +14676,7 @@ index 5ccdc0b87b..888dae2d5e 100644
try {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 4e1b4d7cde..9bf854b5a2 100644
index 0aa1da6cc1..89a654b472 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
@@ -14716,7 +14716,7 @@ index 4e1b4d7cde..9bf854b5a2 100644
}
@Override
@@ -2272,6 +2277,14 @@ public final class CraftServer implements Server {
@@ -2275,6 +2280,14 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}