Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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:
c4ae0002 Fix some API and commands usage of inactive chunks (#2457)
700a6649 Print entity debug stacktrace on entity double add (#2438)
9d6680ee Fix MC-158900 (#2458)
928abb41 [CI-SKIP] Rebuild patches for last merge
34e64781 Do less work if we have a custom Bukkit generator (#2318)
This commit is contained in:
William Blake Galbreath
2019-08-15 12:55:24 -05:00
parent e9d374a46c
commit 87eeb03354
6 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: cdd0bb4376...c4ae0002e1

2
current-paper
View File

@@ -1 +1 @@
1.14.4--9a331db94dcd70a7f484a1af9896e74d0de44e08 1.14.4--3a747505b7af504d2e80e836bf8f1cfe810411c7

12
patches/server/0051-Asynchronous-chunk-IO-and-loading.patch
View File

@@ -1,4 +1,4 @@
From d5e9cc74d18901973803a30ca23e71253fcf0960 Mon Sep 17 00:00:00 2001 From 244cc8e22e8c2ad480abd369e3bcc041af550c28 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com> From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 13 Jul 2019 09:23:10 -0700 Date: Sat, 13 Jul 2019 09:23:10 -0700
Subject: [PATCH] Asynchronous chunk IO and loading Subject: [PATCH] Asynchronous chunk IO and loading
@@ -3602,7 +3602,7 @@ index b0e6ad773..f6c95ae8c 100644
} }
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index e73257f3f..787dc3e88 100644 index 2969fcd55..0e23eeb1f 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
@@ -3706,10 +3706,10 @@ index e73257f3f..787dc3e88 100644
public void doTick(BooleanSupplier booleansupplier) { public void doTick(BooleanSupplier booleansupplier) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 21f153013..7fe8a5988 100644 index 78e018caa..b8b1bf98c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -538,22 +538,23 @@ public class CraftWorld implements World { @@ -551,22 +551,23 @@ public class CraftWorld implements World {
return true; return true;
} }
@@ -3741,7 +3741,7 @@ index 21f153013..7fe8a5988 100644
// fall through to load // fall through to load
// we do this so we do not re-read the chunk data on disk // we do this so we do not re-read the chunk data on disk
@@ -2336,16 +2337,17 @@ public class CraftWorld implements World { @@ -2349,16 +2350,17 @@ public class CraftWorld implements World {
@Override @Override
public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) { public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
@@ -3769,5 +3769,5 @@ index 21f153013..7fe8a5988 100644
// Paper end // Paper end
-- --
2.20.1 2.23.0.rc1

12
patches/server/0054-implement-optional-per-player-mob-spawns.patch
View File

@@ -1,4 +1,4 @@
From 88eefa693e3cd107d509050841e1a2d478e9b837 Mon Sep 17 00:00:00 2001 From a588cde615cc358ee14a68296bd46ff6d278deed Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com> From: kickash32 <kickash32@gmail.com>
Date: Tue, 11 Jun 2019 22:22:16 -0400 Date: Tue, 11 Jun 2019 22:22:16 -0400
Subject: [PATCH] implement optional per player mob spawns Subject: [PATCH] implement optional per player mob spawns
@@ -225,7 +225,7 @@ index 62fc61df2..b2a1999bb 100644
@Nullable @Nullable
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 787dc3e88..50fcab233 100644 index 0e23eeb1f..0bbd28ed8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -70,6 +70,7 @@ public class WorldServer extends World { @@ -70,6 +70,7 @@ public class WorldServer extends World {
@@ -236,7 +236,7 @@ index 787dc3e88..50fcab233 100644
// CraftBukkit start // CraftBukkit start
private int tickPosition; private int tickPosition;
@@ -964,6 +965,16 @@ public class WorldServer extends World { @@ -966,6 +967,16 @@ public class WorldServer extends World {
} }
public Object2IntMap<EnumCreatureType> l() { public Object2IntMap<EnumCreatureType> l() {
@@ -253,7 +253,7 @@ index 787dc3e88..50fcab233 100644
Object2IntMap<EnumCreatureType> object2intmap = new Object2IntOpenHashMap(); Object2IntMap<EnumCreatureType> object2intmap = new Object2IntOpenHashMap();
ObjectIterator objectiterator = this.entitiesById.values().iterator(); ObjectIterator objectiterator = this.entitiesById.values().iterator();
@@ -988,6 +999,7 @@ public class WorldServer extends World { @@ -990,6 +1001,7 @@ public class WorldServer extends World {
entity.spawnReason == CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) { entity.spawnReason == CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) {
continue; continue;
} }
@@ -261,7 +261,7 @@ index 787dc3e88..50fcab233 100644
// Paper end // Paper end
object2intmap.mergeInt(enumcreaturetype, 1, Integer::sum); object2intmap.mergeInt(enumcreaturetype, 1, Integer::sum);
} }
@@ -996,6 +1008,20 @@ public class WorldServer extends World { @@ -998,6 +1010,20 @@ public class WorldServer extends World {
return object2intmap; return object2intmap;
} }
@@ -283,5 +283,5 @@ index 787dc3e88..50fcab233 100644
public boolean addEntity(Entity entity) { public boolean addEntity(Entity entity) {
// CraftBukkit start // CraftBukkit start
-- --
2.20.1 2.23.0.rc1

12
patches/server/0055-Don-t-recalculate-permissions-for-players-on-world-c.patch
View File

@@ -1,4 +1,4 @@
From 02b283ebcb6564ec20c53360f7ef49a7e5077e5f Mon Sep 17 00:00:00 2001 From 95f61700633ff04a5734635b9a5299526728d2ee Mon Sep 17 00:00:00 2001
From: Tom <cryptite@gmail.com> From: Tom <cryptite@gmail.com>
Date: Fri, 12 Jul 2019 07:59:35 -0500 Date: Fri, 12 Jul 2019 07:59:35 -0500
Subject: [PATCH] Don't recalculate permissions for players on world change Subject: [PATCH] Don't recalculate permissions for players on world change
@@ -9,10 +9,10 @@ Subject: [PATCH] Don't recalculate permissions for players on world change
2 files changed, 7 insertions(+), 1 deletion(-) 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index a183bb45..11ba67d5 100644 index 3cb443c4f..a33285379 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -709,7 +709,7 @@ public abstract class PlayerList { @@ -711,7 +711,7 @@ public abstract class PlayerList {
entityplayer1.playerConnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked())); entityplayer1.playerConnection.sendPacket(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
entityplayer1.playerConnection.sendPacket(new PacketPlayOutExperience(entityplayer1.exp, entityplayer1.expTotal, entityplayer1.expLevel)); entityplayer1.playerConnection.sendPacket(new PacketPlayOutExperience(entityplayer1.exp, entityplayer1.expTotal, entityplayer1.expLevel));
this.a(entityplayer1, worldserver); this.a(entityplayer1, worldserver);
@@ -21,7 +21,7 @@ index a183bb45..11ba67d5 100644
if (!entityplayer.playerConnection.isDisconnected()) { if (!entityplayer.playerConnection.isDisconnected()) {
worldserver.addPlayerRespawn(entityplayer1); worldserver.addPlayerRespawn(entityplayer1);
this.players.add(entityplayer1); this.players.add(entityplayer1);
@@ -750,6 +750,7 @@ public abstract class PlayerList { @@ -752,6 +752,7 @@ public abstract class PlayerList {
return entityplayer1; return entityplayer1;
} }
@@ -30,7 +30,7 @@ index a183bb45..11ba67d5 100644
GameProfile gameprofile = entityplayer.getProfile(); GameProfile gameprofile = entityplayer.getProfile();
int i = this.server.a(gameprofile); int i = this.server.a(gameprofile);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 01c9d086..20231143 100644 index 01c9d0861..20231143e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -166,6 +166,11 @@ public class PurpurConfig { @@ -166,6 +166,11 @@ public class PurpurConfig {
@@ -46,5 +46,5 @@ index 01c9d086..20231143 100644
private static void requireShiftToMount() { private static void requireShiftToMount() {
requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount); requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
-- --
2.20.1 2.23.0.rc1

24
patches/server/0058-Advancement-stuffs.patch Normal file
View File

@@ -0,0 +1,24 @@
From 89cb55714c89430c7675fc909da2c0ebf0b07c87 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 11 Aug 2019 22:25:33 -0500
Subject: [PATCH] Advancement stuffs
---
src/main/java/net/minecraft/server/CriterionTrigger.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/CriterionTrigger.java b/src/main/java/net/minecraft/server/CriterionTrigger.java
index 4fe732447..6e5d81daf 100644
--- a/src/main/java/net/minecraft/server/CriterionTrigger.java
+++ b/src/main/java/net/minecraft/server/CriterionTrigger.java
@@ -27,6 +27,7 @@ public interface CriterionTrigger<T extends CriterionInstance> {
this.c = s;
}
+ public T getInstance() { return a(); } // Purpur - OBFHELPER
public T a() {
return this.a;
}
--
2.23.0.rc1