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:
6e7dc3f81 [Auto] Updated Upstream (CraftBukkit)
664ae4554 [Auto] Updated Upstream (CraftBukkit)
dafc7b8f8 Fix off by one error for scheduling block ticks (#4014)
5791e512b Fix MaterialTags tests to actually pass
115972651 Expand MaterialTags v2 (#4009)
5aaf1c514 prevent path space splitting in testServer.sh (#4007)
a8ef09b82 Tighten logic for handling target tick times in tick scheduler (#4010)
d5ccd4139 Remove ability to disable async chunks unless single core cpu
76728529f Fix Light Prioritization Issues
2d66b5be8 [Auto] Updated Upstream (CraftBukkit)
51d10c201 Add missing strikeLighting call to World#spigot()#strikeLightningEffect

Tuinity Changes:
416ed5e Fix 3 tick pistons not functioning correctly
489faf0 Fix up lock handling for UserCache
This commit is contained in:
William Blake Galbreath
2020-07-28 12:51:43 -05:00
parent 331571119c
commit fe05292d11
9 changed files with 84 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
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/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3db19a9ba..ebbd81a2d 100644
index 3db19a9bab..ebbd81a2db 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1563,6 +1563,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,7 +17,7 @@ index 3db19a9ba..ebbd81a2d 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 2cada09ce..a69a69859 100644
index 2cada09ced..a69a698594 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 {
@@ -37,7 +37,7 @@ index 2cada09ce..a69a69859 100644
super(EntityTypes.PLAYER, world);
this.bS = ItemStack.b;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 4550e3449..a00993e32 100644
index 4550e3449b..a00993e328 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1752,8 +1752,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -96,7 +96,7 @@ index 4550e3449..a00993e32 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 0edcb775e..dfa8f3439 100644
index 0edcb775e9..dfa8f3439b 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -144,28 +144,18 @@ public interface IEntityAccess {
@@ -141,7 +141,7 @@ index 0edcb775e..dfa8f3439 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index a52dd0c02..9b4795f3b 100644
index a52dd0c021..9b4795f3bd 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;
@@ -161,7 +161,7 @@ index a52dd0c02..9b4795f3b 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 5af6140a7..1e61b179f 100644
index bf603ba34f..8b70ccb604 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -232,6 +232,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -205,7 +205,7 @@ index 5af6140a7..1e61b179f 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 8388629f5..a1870fbd6 100644
index 2bee2dab9f..748ace6aa6 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -862,7 +862,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -217,7 +217,7 @@ index 8388629f5..a1870fbd6 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -1193,7 +1193,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1195,7 +1195,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -227,7 +227,7 @@ index 8388629f5..a1870fbd6 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 803a7ff92..d699a9168 100644
index 803a7ff92a..d699a91685 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,6 +1,7 @@
@@ -255,7 +255,7 @@ index 803a7ff92..d699a9168 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 361f7857e..2578a4677 100644
index 361f7857e4..2578a4677d 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 {
@@ -275,7 +275,7 @@ index 361f7857e..2578a4677 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 72cd52fd7..41184219e 100644
index 72cd52fd7f..41184219ee 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2155,4 +2155,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -301,7 +301,7 @@ index 72cd52fd7..41184219e 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index f78e44e05..da4c49daf 100644
index f78e44e05f..da4c49daf4 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -207,6 +207,7 @@ public class ActivationRange