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 appears to apply and compile correctly

Paper Changes:
ffecc4e2 Revert "Optimize entity list iteration requiring entities be in"
0a4286cc Prevent Fire from loading chunks
07915ea1 Add Player Client Options API (#2883)
bc48a317 Optimize entity list iteration requiring entities be in  loaded chunks
88092fef Optimize ChunkProviderServer's chunk level checking helper methods
01e8ce8d Forced Watchdog Crash support and Improve Async Shutdown
fdb8fe78 Be less strict with vanilla teleport command limits
This commit is contained in:
William Blake Galbreath
2020-04-17 15:32:51 -05:00
parent 6c4aab0053
commit e4a8964a8b
19 changed files with 221 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
patches/server/0039-Implement-AFK-API.patch
View File

@@ -1,4 +1,4 @@
From 7e6b7af3b6081ab19c08cb19001e14be79870ae6 Mon Sep 17 00:00:00 2001
From eaf0f8b22feee7eba44b04113dbcd6e8a30ce6ca 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 3bc4327a1..8a2fcb37f 100644
index 3bc4327a10..8a2fcb37f9 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1420,6 +1420,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -30,7 +30,7 @@ index 3bc4327a1..8a2fcb37f 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 f372c13d8..d69854b5c 100644
index 4cf420de0b..1ffe38e151 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,10 +50,10 @@ index f372c13d8..d69854b5c 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 b2bf1be75..f98780d0e 100644
index a0990bcf72..c1d264fd05 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1624,8 +1624,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1626,8 +1626,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.cj = SystemUtils.getMonotonicMillis();
@@ -106,7 +106,7 @@ index b2bf1be75..f98780d0e 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 899619009..d9f246b87 100644
index 8996190090..d9f246b874 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -125,28 +125,18 @@ public interface IEntityAccess {
@@ -151,7 +151,7 @@ index 899619009..d9f246b87 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index e1fdee279..4665671ef 100644
index e1fdee2794..4665671ef6 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 e1fdee279..4665671ef 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 895e34ed3..f92516069 100644
index 895e34ed34..f92516069a 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -223,6 +223,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -206,7 +206,7 @@ index 895e34ed3..f92516069 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 e98747903..0e30dcb87 100644
index e98747903c..0e30dcb87b 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -393,7 +393,7 @@ public class WorldServer extends World {
@@ -228,7 +228,7 @@ index e98747903..0e30dcb87 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 c6bf9395c..76f8c8fed 100644
index c6bf9395c1..76f8c8fed1 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,10 +250,10 @@ index c6bf9395c..76f8c8fed 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 33cac5fcb..aa6f67cad 100644
index b76379a17c..b7571d0866 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2057,4 +2057,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2079,4 +2079,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return spigot;
}
// Spigot end
@@ -276,7 +276,7 @@ index 33cac5fcb..aa6f67cad 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 795817177..17c4d7ec9 100644
index 795817177a..17c4d7ec9b 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -146,6 +146,7 @@ public class ActivationRange
@@ -288,7 +288,7 @@ index 795817177..17c4d7ec9 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 @@
@@ -299,5 +299,5 @@ index 7125c0477..e925e1374 100644
+ "idle.timeout.broadcast.back": "§e§o%s is no longer AFK"
}
--
2.25.0.windows.1
2.24.0