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

Updated Upstream (Paper & Tuinity)

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

Paper Changes:
372dc10f Updated Upstream (CraftBukkit) (#4760)
d6fb9717 Updated Upstream (CraftBukkit)

Tuinity Changes:
2194b64 Optimizations (starlight, aka leaflight)
1a412ae Fix worldborder crash
957a2ef Fix chunk object leak
bcfe550 Re-Add unload poi data patch
This commit is contained in:
BillyGalbreath
2020-11-14 06:55:31 -06:00
parent f513a2f49b
commit 21e0b98494
23 changed files with 5714 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
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 caaa01b20e..335cb9c4a9 100644
index caaa01b20..335cb9c4a 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,10 +25,10 @@ index caaa01b20e..335cb9c4a9 100644
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 56677b8bf4..77156ecff2 100644
index f8921eb83..c7cf49897 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1722,8 +1722,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1890,8 +1890,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.ca = SystemUtils.getMonotonicMillis();
@@ -84,7 +84,7 @@ index 56677b8bf4..77156ecff2 100644
return this.serverStatisticManager;
}
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 40ca3364d4..9643dffc59 100644
index 40ca3364d..9643dffc5 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -149,28 +149,18 @@ public interface IEntityAccess {
@@ -129,7 +129,7 @@ index 40ca3364d4..9643dffc59 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 31eb6868c2..9f9d9b2de8 100644
index 31eb6868c..9f9d9b2de 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -154,7 +154,7 @@ index 31eb6868c2..9f9d9b2de8 100644
// Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index b89caa8ad1..4365d0bbb5 100644
index b89caa8ad..4365d0bbb 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -247,6 +247,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -198,10 +198,10 @@ index b89caa8ad1..4365d0bbb5 100644
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 274a383be1..95159d501a 100644
index 0ac1bd39a..18e4fe468 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -982,7 +982,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -834,7 +834,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
// CraftBukkit end
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -210,7 +210,7 @@ index 274a383be1..95159d501a 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -1303,7 +1303,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1171,7 +1171,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -220,7 +220,7 @@ index 274a383be1..95159d501a 100644
} else if (entityplayer.isSleeping()) {
++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 803a7ff92a..d699a91685 100644
index 803a7ff92..d699a9168 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,6 +1,7 @@
@@ -248,7 +248,7 @@ index 803a7ff92a..d699a91685 100644
private static void timingsSettings() {
timingsUrl = getString("settings.timings.url", timingsUrl);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 361f7857e4..2578a4677d 100644
index 361f7857e..2578a4677 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -56,4 +56,15 @@ public class PurpurWorldConfig {
@@ -268,7 +268,7 @@ index 361f7857e4..2578a4677d 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f4f4e29f56..93c8f9fc8d 100644
index f4f4e29f5..93c8f9fc8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2216,4 +2216,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -294,7 +294,7 @@ index f4f4e29f56..93c8f9fc8d 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 0b93635ba5..b47d6fa2de 100644
index 0b93635ba..b47d6fa2d 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -207,6 +207,7 @@ public class ActivationRange