mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appears to apply and compile correctly Paper Changes: b0b54e4e Optimize Villager Pathfinding - Massive Villager Improvement 33a2134b Workaround for really evil plugins breaking sounds b88ee11f Don't unregister the primary dimensions on world unload 21f9efa2 Improve implementation of chunk leak clean to not run as often 7ee71146 Add missing null check for structure start chunk access b12177fb One more to seal the deal to improve unloading inactive chunks 78ee3b4e Restore a condition I accidently removed in last build 88a68829 Fix unloading inaccessible chunks too fast regressing gen speed 210a32f2 Unload leaked Cached Chunks c9795e92 Fix Spigot bug with chunk unloading
This commit is contained in:
William Blake Galbreath
@@ -1,4 +1,4 @@
|
||||
From 08028ae0a027ecced21386341be053dc433ec59f Mon Sep 17 00:00:00 2001
|
||||
From daea9aea4038129c2b8b41593497c2da341f0c43 Mon Sep 17 00:00:00 2001
|
||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
||||
Date: Thu, 8 Aug 2019 15:29:15 -0500
|
||||
Subject: [PATCH] Implement AFK API
|
||||
@@ -18,7 +18,7 @@ Subject: [PATCH] Implement AFK API
|
||||
11 files changed, 111 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index 5d39d86f0..46bc91524 100644
|
||||
index 5d39d86f0f..46bc91524b 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -1438,6 +1438,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@@ -30,7 +30,7 @@ index 5d39d86f0..46bc91524 100644
|
||||
double d3 = this.locX() - d0;
|
||||
double d4 = this.locY() - d1;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
index 27cfc6654..d62174e9c 100644
|
||||
index 27cfc6654e..d62174e9c7 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
||||
@@ -86,6 +86,15 @@ public abstract class EntityHuman extends EntityLiving {
|
||||
@@ -50,7 +50,7 @@ index 27cfc6654..d62174e9c 100644
|
||||
super(EntityTypes.PLAYER, world);
|
||||
this.bV = ItemStack.a;
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
index b66f9cd2c..0834ca328 100644
|
||||
index b66f9cd2c4..0834ca328b 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||
@@ -1625,8 +1625,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||
@@ -106,7 +106,7 @@ index b66f9cd2c..0834ca328 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 e0d97d2c8..e1a7926d7 100644
|
||||
index e0d97d2c8b..e1a7926d7a 100644
|
||||
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
|
||||
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
|
||||
@@ -150,28 +150,18 @@ public interface IEntityAccess {
|
||||
@@ -151,7 +151,7 @@ index e0d97d2c8..e1a7926d7 100644
|
||||
|
||||
@Nullable
|
||||
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
|
||||
index 1398c47a2..0bf1a14b7 100644
|
||||
index 1398c47a2f..0bf1a14b7c 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;
|
||||
@@ -171,7 +171,7 @@ index 1398c47a2..0bf1a14b7 100644
|
||||
public static Predicate<Entity> a(double d0, double d1, double d2, double d3) {
|
||||
double d4 = d3 * d3;
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index ee961bc05..17b23ed2f 100644
|
||||
index ee961bc05c..17b23ed2fb 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -233,6 +233,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||||
@@ -206,10 +206,10 @@ index ee961bc05..17b23ed2f 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 441249284..afb6ad44a 100644
|
||||
index b65df63333..8018bf6dd8 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -405,7 +405,7 @@ public class WorldServer extends World {
|
||||
@@ -408,7 +408,7 @@ public class WorldServer extends World {
|
||||
}
|
||||
|
||||
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
|
||||
@@ -218,7 +218,7 @@ index 441249284..afb6ad44a 100644
|
||||
})) {
|
||||
// CraftBukkit start
|
||||
long l = this.worldData.getDayTime() + 24000L;
|
||||
@@ -723,7 +723,7 @@ public class WorldServer extends World {
|
||||
@@ -726,7 +726,7 @@ public class WorldServer extends World {
|
||||
while (iterator.hasNext()) {
|
||||
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
|
||||
|
||||
@@ -228,7 +228,7 @@ index 441249284..afb6ad44a 100644
|
||||
} else if (entityplayer.isSleeping()) {
|
||||
++j;
|
||||
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
index d6405b2ec..41dd1b861 100644
|
||||
index d6405b2ec5..41dd1b8616 100644
|
||||
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
||||
@@ -138,6 +138,17 @@ public class PurpurWorldConfig {
|
||||
@@ -250,7 +250,7 @@ index d6405b2ec..41dd1b861 100644
|
||||
public boolean batRidableInWater = false;
|
||||
public boolean batRequireShiftToMount = true;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index dcbda5b35..c14493929 100644
|
||||
index dcbda5b35a..c144939291 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -2079,4 +2079,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@@ -276,7 +276,7 @@ index dcbda5b35..c14493929 100644
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
index f735217e7..818f8070c 100644
|
||||
index f735217e7a..818f8070c5 100644
|
||||
--- a/src/main/java/org/spigotmc/ActivationRange.java
|
||||
+++ b/src/main/java/org/spigotmc/ActivationRange.java
|
||||
@@ -207,6 +207,7 @@ public class ActivationRange
|
||||
@@ -288,7 +288,7 @@ index f735217e7..818f8070c 100644
|
||||
ActivationType.MISC.boundingBox = player.getBoundingBox().grow( miscActivationRange, 256, miscActivationRange );
|
||||
ActivationType.RAIDER.boundingBox = player.getBoundingBox().grow( raiderActivationRange, 256, raiderActivationRange );
|
||||
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
|
||||
index 7125c0477..e925e1374 100644
|
||||
index 7125c0477e..e925e1374d 100644
|
||||
--- a/src/main/resources/purpur.lang
|
||||
+++ b/src/main/resources/purpur.lang
|
||||
@@ -1,3 +1,5 @@
|
||||
|
||||
Reference in New Issue
Block a user