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:
ab74bb45 Speed up processing of chunk loads and generation
f5dd491f Increase Light Queue Size
9ab69348 Don't load chunks when attempting to unload a chunk
38c62622 Improve Optimize Memory use logic to make iterator safer and fix bad plugins like P2
This commit is contained in:
William Blake Galbreath
2020-04-09 19:37:51 -05:00
parent a29baddb7d
commit 16e780dcdb
20 changed files with 68 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: d33ba160a4...ab74bb4514

2
current-paper
View File

@@ -1 +1 @@
1.15.2--57471065365b19e16dbae57049701025c1055af2
1.15.2--e3c2ae70a63a25765cb15a17d3ade3b7fd06f5b7

6
patches/server/0001-Rebrand.patch
View File

@@ -1,4 +1,4 @@
From 8b918322cf149de46b4bb4b793ce6daa5ca3fe56 Mon Sep 17 00:00:00 2001
From 6bc4c7906669c44712c2707619b491897537e761 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
@@ -107,10 +107,10 @@ index cd6e259239..bb227bc0fb 100644
);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c9deaffc4a..b31a9ac78c 100644
index 936434110c..aec5ef2e33 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1484,7 +1484,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1499,7 +1499,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {

6
patches/server/0014-Zombie-horse-naturally-spawn.patch
View File

@@ -1,4 +1,4 @@
From 86d744e619ded147013c506fcab0423e8542e6ed Mon Sep 17 00:00:00 2001
From 91984aa97fb03de5d715aeba4f1c79b9af4cf5a8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 7 Jul 2019 19:52:16 -0500
Subject: [PATCH] Zombie horse naturally spawn
@@ -9,10 +9,10 @@ Subject: [PATCH] Zombie horse naturally spawn
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c7ec8cbc11..02f711540b 100644
index 43573287f2..42798f6e00 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -561,12 +561,18 @@ public class WorldServer extends World {
@@ -568,12 +568,18 @@ public class WorldServer extends World {
boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
if (flag1) {

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

@@ -1,4 +1,4 @@
From e9bdca4840b46744fdac8cd236bcb80545361c47 Mon Sep 17 00:00:00 2001
From 7c7399ed6100b8e4794b6092d35632f597694ce9 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
@@ -206,7 +206,7 @@ index 895e34ed34..f92516069a 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 02f711540b..0eca6f42d9 100644
index 42798f6e00..efe9796c4a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -383,7 +383,7 @@ public class WorldServer extends World {
@@ -218,7 +218,7 @@ index 02f711540b..0eca6f42d9 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -689,7 +689,7 @@ public class WorldServer extends World {
@@ -696,7 +696,7 @@ public class WorldServer extends World {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();

6
patches/server/0044-Make-the-GUI-better.patch
View File

@@ -1,4 +1,4 @@
From ad0065c28eb221e73573fc8f9bc1e5a72fcf45fc Mon Sep 17 00:00:00 2001
From 9b8a27001d68292d0390367c6284393100d756e2 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 16 Jan 2020 14:59:16 -0600
Subject: [PATCH] Make the GUI better
@@ -88,10 +88,10 @@ index e614570d33..bd9c123d56 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b31a9ac78c..f939f56d96 100644
index aec5ef2e33..63cc289e44 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1291,6 +1291,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1306,6 +1306,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
return true;
}

8
patches/server/0048-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From eef7618cf7493834b52ae7986d84d84dbde318d6 Mon Sep 17 00:00:00 2001
From 6f706722898460ae8b2a24a3782e2353cb6509e7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:24 -0600
Subject: [PATCH] Add tick times API
@@ -9,7 +9,7 @@ Subject: [PATCH] Add tick times API
2 files changed, 49 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f939f56d96..334ebae14f 100644
index 63cc289e44..e4b1eabd77 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -106,6 +106,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -24,7 +24,7 @@ index f939f56d96..334ebae14f 100644
@Nullable
private KeyPair I;
@Nullable
@@ -1160,6 +1165,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1175,6 +1180,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.methodProfiler.enter("tallying");
long l = this.f[this.ticks % 100] = SystemUtils.getMonotonicNanos() - i;
@@ -37,7 +37,7 @@ index f939f56d96..334ebae14f 100644
this.av = this.av * 0.8F + (float) l / 1000000.0F * 0.19999999F;
long i1 = SystemUtils.getMonotonicNanos();
@@ -2255,4 +2266,30 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -2270,4 +2281,30 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
return SERVER; // Paper
}
// CraftBukkit end

6
patches/server/0050-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From 652c74660ca2847379061598db0d76f1778cedad Mon Sep 17 00:00:00 2001
From b8502fc595d496a47f136d6aa11e995572d43ce3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:16 -0500
Subject: [PATCH] Implement lagging threshold
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement lagging threshold
3 files changed, 12 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 334ebae14f..14d6f67c2b 100644
index e4b1eabd77..510da109b0 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -183,6 +183,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -28,7 +28,7 @@ index 334ebae14f..14d6f67c2b 100644
+ lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
}
// Spigot end
chunksTasksRan = 0; // Paper
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index e219312168..b608b1deb3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java

6
patches/server/0065-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From 7151dc13ef404e96cb75b6cd798cad2dfaebf073 Mon Sep 17 00:00:00 2001
From fb0fe965e1fe07f94203bc077b7a7e1efa071dca Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:16 -0600
Subject: [PATCH] Add moon phase API
@@ -8,10 +8,10 @@ Subject: [PATCH] Add moon phase API
1 file changed, 8 insertions(+)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c0e8eb85d7..a9b5aebc5b 100644
index 1fbb1344fc..0054fe2a6d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2448,6 +2448,14 @@ public class CraftWorld implements World {
@@ -2457,6 +2457,14 @@ public class CraftWorld implements World {
return new CraftDragonBattle(((WorldProviderTheEnd) worldProvider).o()); // PAIL rename getDragonBattle
}

6
patches/server/0066-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From f896ee41ea77dca8f6780c15fea5dfd93a5e21ff Mon Sep 17 00:00:00 2001
From beafcfd03b677a595ce23efd4a78d4f3c3679351 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 8 Feb 2020 23:30:17 -0600
Subject: [PATCH] Add getPlacementBlockData to World
@@ -66,10 +66,10 @@ index 9c9b93f280..74a722cce5 100644
public static final Item bZ = a(Blocks.CHEST, CreativeModeTab.c);
public static final Item ca = a(Blocks.DIAMOND_ORE, CreativeModeTab.b);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a9b5aebc5b..1da89471a0 100644
index 0054fe2a6d..cc35f322a8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2454,6 +2454,11 @@ public class CraftWorld implements World {
@@ -2463,6 +2463,11 @@ public class CraftWorld implements World {
public net.pl3x.purpur.MoonPhase getMoonPhase() {
return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L);
}

6
patches/server/0078-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch
View File

@@ -1,4 +1,4 @@
From 36028417beb9fccaf9738d4a435038f84a9d139b Mon Sep 17 00:00:00 2001
From 0c3f0203c4cf6d999a7fa8e09f0bf70c351398f0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 01:42:50 -0500
Subject: [PATCH] Fix SpawnChangeEvent not firing for all use-cases
@@ -25,10 +25,10 @@ index ae36518374..b2dd0c2073 100644
public boolean a(EntityHuman entityhuman, BlockPosition blockposition) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1da89471a0..e3240c431a 100644
index cc35f322a8..87ede14251 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -381,12 +381,16 @@ public class CraftWorld implements World {
@@ -383,12 +383,16 @@ public class CraftWorld implements World {
@Override
public boolean setSpawnLocation(int x, int y, int z) {
try {

6
patches/server/0102-Configurable-server-mod-name.patch
View File

@@ -1,4 +1,4 @@
From 948b40b88aebc684f74009a19774fab344998de2 Mon Sep 17 00:00:00 2001
From 4e4ac39d11481c3b4692b36aa177607178363464 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 21 Mar 2020 11:47:39 -0500
Subject: [PATCH] Configurable server mod name
@@ -9,10 +9,10 @@ Subject: [PATCH] Configurable server mod name
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8390ce7b54..487a9149d8 100644
index 02f4963fe3..fc84a7e096 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1514,7 +1514,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1529,7 +1529,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {

6
patches/server/0104-Configurable-TPS-Catchup.patch
View File

@@ -1,4 +1,4 @@
From 7ca42744a81e168e222a0b1d4fe2b6f7b3ffec8a Mon Sep 17 00:00:00 2001
From 95e0759fda9fa3e5bddfbde67a5d26496c624db6 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 19:06:22 -0500
Subject: [PATCH] Configurable TPS Catchup
@@ -9,10 +9,10 @@ Subject: [PATCH] Configurable TPS Catchup
2 files changed, 12 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 487a9149d8..daa34492c6 100644
index fc84a7e096..6059933c5f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -958,6 +958,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -959,6 +959,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.methodProfiler.exitEnter("nextTickWait");
this.ac = true;
this.ab = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);

6
patches/server/0108-Optimize-entity-pathfinder-selector.patch
View File

@@ -1,4 +1,4 @@
From 352d63b5d92d8fca4f7b4c1467c3e23c7d82fa1a Mon Sep 17 00:00:00 2001
From 974d84555d47b46d87aca6f8365d6608f17a6d27 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 6 Mar 2020 16:33:58 -0600
Subject: [PATCH] Optimize entity pathfinder selector
@@ -13,10 +13,10 @@ Subject: [PATCH] Optimize entity pathfinder selector
create mode 100644 src/main/java/com/tuinity/tuinity/util/OptimizedSmallEnumSet.java
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
index 69e26a8267..2fa2cd297a 100644
index 434833d50e..7fc9a625a3 100644
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -42,6 +42,12 @@ public final class MinecraftTimings {
@@ -43,6 +43,12 @@ public final class MinecraftTimings {
public static final Timing antiXrayUpdateTimer = Timings.ofSafe("anti-xray - update");
public static final Timing antiXrayObfuscateTimer = Timings.ofSafe("anti-xray - obfuscate");

22
patches/server/0109-Optimize-Chunk-Ticks.patch
View File

@@ -1,19 +1,19 @@
From a5ff94c33d6be044c252853121f6b3d491251720 Mon Sep 17 00:00:00 2001
From c48af70fbccc813d46cc8cfa972bf2e4ad26ef5a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Apr 2020 00:28:06 -0500
Subject: [PATCH] Optimize Chunk Ticks
---
.../minecraft/server/ChunkProviderServer.java | 72 ++++++-------------
.../minecraft/server/ChunkProviderServer.java | 70 ++++++-------------
.../minecraft/server/EnumCreatureType.java | 14 ++++
.../net/minecraft/server/PlayerChunkMap.java | 30 ++++----
3 files changed, 52 insertions(+), 64 deletions(-)
3 files changed, 51 insertions(+), 63 deletions(-)
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 59055cccc5..aad33cdc18 100644
index 15450f36a4..276f1adcec 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -630,11 +630,12 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -632,11 +632,12 @@ public class ChunkProviderServer extends IChunkProvider {
int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED);
BlockPosition blockposition = this.world.getSpawn();
// CraftBukkit start - Other mob type spawn tick rate
@@ -31,7 +31,7 @@ index 59055cccc5..aad33cdc18 100644
// CraftBukkit end
this.world.getMethodProfiler().enter("naturalSpawnCount");
@@ -660,16 +661,18 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -662,15 +663,17 @@ public class ChunkProviderServer extends IChunkProvider {
this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings
this.world.getMethodProfiler().exit();
@@ -44,7 +44,6 @@ index 59055cccc5..aad33cdc18 100644
- entityPlayer.playerNaturallySpawnedEvent.callEvent();
- };
- // Paper end
- this.playerChunkMap.visibleChunks.values().forEach((playerchunk) -> { // Paper - no need to wrap iterator
+ // Purpur start
+ if (com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent.getHandlerList().getRegisteredListeners().length > 0) {
+ // Paper start - call player naturally spawn event
@@ -56,11 +55,10 @@ index 59055cccc5..aad33cdc18 100644
+ // Paper end
+ }
+ // Purpur end
+ this.playerChunkMap.visibleChunks.values().forEach((playerchunk) -> { // Paper - no need to wrap iterator
final int[] chunksTicked = {0}; this.playerChunkMap.forEachVisibleChunk((playerchunk) -> { // Paper - safe iterator incase chunk loads, also no wrapping
Optional<Chunk> optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left();
if (optional.isPresent()) {
@@ -688,40 +691,11 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -690,40 +693,11 @@ public class ChunkProviderServer extends IChunkProvider {
if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(chunkcoordintpair, true)) { // Spigot
this.world.getMethodProfiler().enter("spawner");
this.world.timings.mobSpawn.startTiming(); // Spigot
@@ -137,10 +135,10 @@ index 3ed7fa324f..7f236585db 100644
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index fbd3e4ea2c..1c7c3f96fb 100644
index c21a3ea506..47dcc3e745 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1333,28 +1333,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1351,28 +1351,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair, boolean reducedRange) {

10
patches/server/0111-Add-more-timings-timers.patch
View File

@@ -1,4 +1,4 @@
From 8a146aa63d0e2fa18567fef8990d10d0cab32730 Mon Sep 17 00:00:00 2001
From e883bbd022a3366c55638d766bac3360073daef9 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Apr 2020 02:36:45 -0500
Subject: [PATCH] Add more timings timers
@@ -11,10 +11,10 @@ Subject: [PATCH] Add more timings timers
4 files changed, 44 insertions(+)
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
index 2fa2cd297a..5d65a71d67 100644
index 7fc9a625a3..cb27ed36e6 100644
--- a/src/main/java/co/aikar/timings/MinecraftTimings.java
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -46,6 +46,22 @@ public final class MinecraftTimings {
@@ -47,6 +47,22 @@ public final class MinecraftTimings {
public static final Timing goalCleanup = Timings.ofSafe("PathfinderGoal - Cleanup");
public static final Timing goalUpdate = Timings.ofSafe("PathfinderGoal - Update");
public static final Timing goalTick = Timings.ofSafe("PathfinderGoal - Tick");
@@ -157,10 +157,10 @@ index 2769077bb4..fdb8a0f8c7 100644
// Purpur start
if (EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 6c95497ee1..04a5d0b56e 100644
index 5b01cf947d..27c3ad7311 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -808,7 +808,9 @@ public class WorldServer extends World {
@@ -815,7 +815,9 @@ public class WorldServer extends World {
return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString();
});
gameprofilerfiller.c("tickPassenger");

6
patches/server/0122-PaperPR-Per-World-Spawn-limits.patch
View File

@@ -1,4 +1,4 @@
From 2df3e706cdbb46a108aa24cb76b517c71b9de9e1 Mon Sep 17 00:00:00 2001
From de6cb27c67dbd6d7184489d2c9e5642e925d8b43 Mon Sep 17 00:00:00 2001
From: chase <chasewhip20@gmail.com>
Date: Sun, 15 Mar 2020 18:32:22 -0600
Subject: [PATCH] PaperPR - Per World Spawn limits
@@ -31,10 +31,10 @@ index b844b93d77..f1cca7219e 100644
public boolean batRidableInWater = false;
public boolean batRequireShiftToMount = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index e3240c431a..8cb9296c36 100644
index 87ede14251..7596fe4e3f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -330,6 +330,13 @@ public class CraftWorld implements World {
@@ -332,6 +332,13 @@ public class CraftWorld implements World {
this.generator = gen;
environment = env;

8
patches/server/0123-Tuinity-Delay-chunk-unloads.patch
View File

@@ -1,4 +1,4 @@
From 8f252f1536581e5d6fa968503d254b706c908512 Mon Sep 17 00:00:00 2001
From 1be20ba4b362f4e35ab907fc9ba3216254449c52 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 25 Oct 2019 02:11:30 -0700
Subject: [PATCH] Tuinity - Delay chunk unloads
@@ -210,11 +210,11 @@ index 6a3723202c..eda4be515c 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8cb9296c36..dac94ec0fe 100644
index 7596fe4e3f..68e1c0c126 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -476,6 +476,7 @@ public class CraftWorld implements World {
net.minecraft.server.IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, false);
@@ -485,6 +485,7 @@ public class CraftWorld implements World {
net.minecraft.server.IChunkAccess chunk = world.getChunkProvider().getChunkAtIfLoadedImmediately(x, z); // Paper
if (chunk != null) {
world.getChunkProvider().removeTicket(TicketType.PLUGIN, chunk.getPos(), 1, Unit.INSTANCE);
+ ((ChunkMapDistance)world.getChunkProvider().playerChunkMap.getChunkMapDistanceManager()).removeTickets(ChunkCoordIntPair.pair(x, z), TicketType.DELAYED_UNLOAD); // Purpur - delay chunk unloads - let plugins override

6
patches/server/0125-Tuinity-Always-able-to-execute-tasks-on-the-main-ser.patch
View File

@@ -1,4 +1,4 @@
From 0ccf09a1645bca549d5ab57a901dbc594406a733 Mon Sep 17 00:00:00 2001
From f7d91586882e500e530d648546a9d0f35bf2c304 Mon Sep 17 00:00:00 2001
From: Spottedleaf <spottedleaf@spottedleaf.dev>
Date: Fri, 3 Apr 2020 02:21:13 -0700
Subject: [PATCH] Tuinity - Always able to execute tasks on the main server
@@ -12,10 +12,10 @@ chunks.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index daa34492c6..914eb19b6e 100644
index 6059933c5f..cefda1cf27 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1053,7 +1053,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1068,7 +1068,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
protected boolean canExecute(TickTask ticktask) {

8
patches/server/0126-YAPFA-Disable-mojang-profiler.patch
View File

@@ -1,4 +1,4 @@
From 2629a3e76dbc840dcd71ab2c8e6473467693cf2b Mon Sep 17 00:00:00 2001
From 47a2326d5a72daeca806725fb545afe49e90c24c Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Thu, 5 Mar 2020 23:08:01 +0100
Subject: [PATCH] YAPFA - Disable mojang profiler
@@ -43,7 +43,7 @@ index f0d72ea39d..e38a684060 100644
throw CommandDebug.b.create();
} else {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 914eb19b6e..c69fbf2548 100644
index cefda1cf27..effbf92365 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -55,7 +55,7 @@ index 914eb19b6e..c69fbf2548 100644
private ServerConnection serverConnection;
public final WorldLoadListenerFactory worldLoadListenerFactory;
private final ServerPing serverPing = new ServerPing();
@@ -1397,6 +1397,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1412,6 +1412,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
String s1 = (String) Optional.ofNullable(optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
final DedicatedServer dedicatedserver = new DedicatedServer(optionset, dedicatedserversettings, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new, s1);
@@ -64,7 +64,7 @@ index 914eb19b6e..c69fbf2548 100644
/*
dedicatedserver.i((String) optionset.valueOf(optionspec7));
dedicatedserver.setPort((Integer) optionset.valueOf(optionspec10));
@@ -1822,6 +1824,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1837,6 +1839,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
public abstract boolean a(EnumGamemode enumgamemode, boolean flag, int i);