Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +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:
f29c7ebd Improve async login (#3189)
9fd36824 Fix Citizens Player NPC tracking issue - Fixes #3186
0e72de1c Fix Player Tracking issue during join process.
f26362af Load Spawn Chunks Asynchronously and Spiral Out
54f762e2 Load Chunks for Login Asynchronously
f2d1b6e5 Clean up duplicate PlayerInitialSpawnEvent
c2d022d7 Fix Longstanding Broken behavior of PlayerJoinEvent
d0a348b9 Broadcast join messages to console
1ef687a4 Don't crash if player is attempted to be removed from untracked chunk.
c11668ac Make sure the chunk conversion task is executed immediately
26fb7cc3 Fix Chunk Post Processing deadlock risk
This commit is contained in:
William Blake Galbreath
2020-04-19 17:06:16 -05:00
parent df15c09fb1
commit fc7824b3a8
19 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 5d1842e8868cd3cc2af5fb15ac2d86524a82999a Mon Sep 17 00:00:00 2001
From fd53dc3126e19880765279a940858612a2581dca 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 a386c1ab48..6c305ed535 100644
index 99bc8da370..07fb62ab1e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1545,7 +1545,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1533,7 +1533,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {

6
patches/server/0004-Add-language-asset-purpur.lang.patch
View File

@@ -1,4 +1,4 @@
From 02eebfc635af34f660421de2fea22c89935fe7cb Mon Sep 17 00:00:00 2001
From 4063b9b2cfbe02d1f6b45b60ccf7204696616ebf Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 13:17:09 -0500
Subject: [PATCH] Add language asset purpur.lang
@@ -12,10 +12,10 @@ Subject: [PATCH] Add language asset purpur.lang
create mode 100644 src/main/resources/purpur.lang
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 202068314e..31e51fcec3 100644
index 75543ee6dc..fd5d62c050 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1562,6 +1562,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1563,6 +1563,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void a(IChatBaseComponent ichatbasecomponent, ChatMessageType chatmessagetype) {

8
patches/server/0007-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 870e5224aba790735b263d869c87d3df33edab3f Mon Sep 17 00:00:00 2001
From 091be5c528bce634c0829d9b28cb85c6562bc714 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
@@ -3387,10 +3387,10 @@ index 0357c9da93..98a657cece 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 31e51fcec3..363c3298de 100644
index fd5d62c050..81c1a9a045 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1293,6 +1293,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1294,6 +1294,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void a(float f, float f1, boolean flag, boolean flag1) {
@@ -3398,7 +3398,7 @@ index 31e51fcec3..363c3298de 100644
if (this.isPassenger()) {
if (f >= -1.0F && f <= 1.0F) {
this.aZ = f;
@@ -1305,7 +1306,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1306,7 +1307,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.jumping = flag;
this.setSneaking(flag1);
}

6
patches/server/0033-Signs-allow-color-codes.patch
View File

@@ -1,4 +1,4 @@
From eeec38fa2de8b3b9d2c0ac2e87327f92d83ba207 Mon Sep 17 00:00:00 2001
From abe8e5ddf2923cb0bd3b4baa90f0ea4c46f49897 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes
@@ -11,10 +11,10 @@ Subject: [PATCH] Signs allow color codes
4 files changed, 25 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 363c3298de..a0990bcf72 100644
index 81c1a9a045..f0639c23c4 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1133,6 +1133,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1134,6 +1134,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public void openSign(TileEntitySign tileentitysign) {
tileentitysign.a((EntityHuman) this);

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

@@ -1,4 +1,4 @@
From eaf0f8b22feee7eba44b04113dbcd6e8a30ce6ca Mon Sep 17 00:00:00 2001
From d8129cb81a8dc728e5b962b7bddc345db3281bcc 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
@@ -50,10 +50,10 @@ index 4cf420de0b..1ffe38e151 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 a0990bcf72..c1d264fd05 100644
index f0639c23c4..2ef9130cb1 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1626,8 +1626,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1627,8 +1627,51 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.cj = SystemUtils.getMonotonicMillis();
@@ -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 e98747903c..0e30dcb87b 100644
index 67448b6e10..4f69818a6b 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 {

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

@@ -1,4 +1,4 @@
From 9a29dc58c1f787698d5f9d6036003100854fe061 Mon Sep 17 00:00:00 2001
From f756e914abeb3344caa5ba2c58c9cc442fe7d4cd 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 018def64aa..fe474e4eba 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 6c305ed535..525f2ae98e 100644
index 07fb62ab1e..6c99c328b3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1352,6 +1352,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1340,6 +1340,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
return true;
}

6
patches/server/0045-Players-should-not-cram-to-death.patch
View File

@@ -1,4 +1,4 @@
From b99562a41571949aab6301245c8bab7f94ec3f97 Mon Sep 17 00:00:00 2001
From 3a472997b11b770bd30b14bfc4a8edc33b3f2eba Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 21 Jul 2019 18:01:46 -0500
Subject: [PATCH] Players should not cram to death
@@ -8,10 +8,10 @@ Subject: [PATCH] Players should not cram to death
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index c1d264fd05..38555711c4 100644
index 2ef9130cb1..22572640b8 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1107,7 +1107,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1108,7 +1108,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {

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

@@ -1,4 +1,4 @@
From 8280d55e029417caa9b62ea83b5b0c4cdcd0c97b Mon Sep 17 00:00:00 2001
From a56c11461734193592270049a9f3fa7ffcbfd6de 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, 14 insertions(+)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 525f2ae98e..38b0fa8e00 100644
index 6c99c328b3..e620f7a74c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -184,6 +184,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -21,7 +21,7 @@ index 525f2ae98e..38b0fa8e00 100644
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -940,6 +941,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -928,6 +929,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
recentTps[1] = tps5.getAverage();
recentTps[2] = tps15.getAverage();
// Paper end

8
patches/server/0068-Add-5-second-tps-average-in-tps.patch
View File

@@ -1,4 +1,4 @@
From fa73dd9962e908a34d880509fff5a1b03fd65adb Mon Sep 17 00:00:00 2001
From b604e2f51da67f811f2ea1b5988dec4288a427a7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 28 Jul 2019 01:27:37 -0500
Subject: [PATCH] Add 5 second tps average in /tps
@@ -10,7 +10,7 @@ Subject: [PATCH] Add 5 second tps average in /tps
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 38b0fa8e00..1f1d2745d7 100644
index e620f7a74c..64aeaaaec1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -183,7 +183,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -22,7 +22,7 @@ index 38b0fa8e00..1f1d2745d7 100644
public boolean lagging = false; // Purpur
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -856,6 +856,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -844,6 +844,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
private long lastTick = 0;
private long catchupTime = 0;
@@ -30,7 +30,7 @@ index 38b0fa8e00..1f1d2745d7 100644
public final RollingAverage tps1 = new RollingAverage(60);
public final RollingAverage tps5 = new RollingAverage(60 * 5);
public final RollingAverage tps15 = new RollingAverage(60 * 15);
@@ -933,13 +934,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -921,13 +922,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
{
final long diff = curTime - tickSection;
java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);

6
patches/server/0084-Add-permission-for-F3-N-debug.patch
View File

@@ -1,4 +1,4 @@
From 640dfe8880c47d2bbea0d179b791b63651199e5b Mon Sep 17 00:00:00 2001
From 0ea379e7daea0f5a1629d72e46659f95b54cbe09 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 28 Dec 2019 04:21:54 -0600
Subject: [PATCH] Add permission for F3+N debug
@@ -8,10 +8,10 @@ Subject: [PATCH] Add permission for F3+N debug
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 6d6fbf2f50..0d985b83d8 100644
index 704994cb81..2e036524c8 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -904,6 +904,7 @@ public abstract class PlayerList {
@@ -919,6 +919,7 @@ public abstract class PlayerList {
} else {
b0 = (byte) (24 + i);
}

6
patches/server/0089-UPnP-Port-Forwarding-Service.patch
View File

@@ -1,4 +1,4 @@
From 8bee092c8f217306aa04de3bab74a97f77b96fdf Mon Sep 17 00:00:00 2001
From 64bdc122b1f0d98447a1cd146feea09d134d5ead Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 22 Jan 2020 20:13:40 -0600
Subject: [PATCH] UPnP Port Forwarding Service
@@ -78,7 +78,7 @@ index fe474e4eba..18fdaf53ef 100644
// this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up
server.loadPlugins();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1f1d2745d7..fc255ddfd1 100644
index 64aeaaaec1..0ae6a9760e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -187,6 +187,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -89,7 +89,7 @@ index 1f1d2745d7..fc255ddfd1 100644
public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
super("Server");
@@ -749,6 +750,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -737,6 +738,15 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
// CraftBukkit end
MinecraftServer.LOGGER.info("Stopping server");
MinecraftTimings.stopServer(); // Paper

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

@@ -1,4 +1,4 @@
From 413e84b63152874399d2d0908986e3f973fb7048 Mon Sep 17 00:00:00 2001
From 8dff020c638fc5c4718e14dd71cfb48be8f4348f 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 fc255ddfd1..6f14ed2726 100644
index 0ae6a9760e..7015611dc4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1563,7 +1563,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1551,7 +1551,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
public String getServerModName() {

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

@@ -1,4 +1,4 @@
From 2279fe808101b3cd719ad86b223ffb54ec601f34 Mon Sep 17 00:00:00 2001
From 63bc9e56072e103ae01bd468c4ec3f4fcbf22347 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 6f14ed2726..3c8acd884a 100644
index 7015611dc4..51fc57100e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -976,6 +976,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -964,6 +964,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
this.methodProfiler.exitEnter("nextTickWait");
this.ac = true;
this.ab = Math.max(SystemUtils.getMonotonicMillis() + 50L, this.nextTick);

14
patches/server/0106-Optimize-Chunk-Ticks.patch
View File

@@ -1,4 +1,4 @@
From 53087de6d5f2560a6a338cefcdf24cc346195c34 Mon Sep 17 00:00:00 2001
From 8a5c3bee5c877ec56a7a53faeb4acbedb7ae75dd 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
@@ -10,10 +10,10 @@ Subject: [PATCH] Optimize Chunk Ticks
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 ba6bdc40a7..e490423d8d 100644
index fd84807a5b..1fae431469 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -656,11 +656,12 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -735,11 +735,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 ba6bdc40a7..e490423d8d 100644
// CraftBukkit end
this.world.getMethodProfiler().enter("naturalSpawnCount");
@@ -686,15 +687,17 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -765,15 +766,17 @@ public class ChunkProviderServer extends IChunkProvider {
this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings
this.world.getMethodProfiler().exit();
@@ -58,7 +58,7 @@ index ba6bdc40a7..e490423d8d 100644
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();
@@ -714,40 +717,11 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -793,40 +796,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
@@ -135,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 c38d31fafe..b7b358c59f 100644
index 8b2eed1051..8d70cacee9 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1371,28 +1371,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1374,28 +1374,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
boolean isOutsideOfRange(ChunkCoordIntPair chunkcoordintpair, boolean reducedRange) {

10
patches/server/0119-Tuinity-Delay-chunk-unloads.patch
View File

@@ -1,4 +1,4 @@
From b299e9c60855215ab0f2849fd643b2f4f98b4ab3 Mon Sep 17 00:00:00 2001
From 9b9c02d7330a016c77147e42462ee459b54edafd 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
@@ -35,7 +35,7 @@ index 55f9f4e6e7..ac21fdb4c9 100644
this.a(ChunkCoordIntPair.a, i, j, flag);
}
diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
index 0244768f76..b69e743950 100644
index 279c7a85fb..f26bc3417e 100644
--- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
+++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
@@ -30,7 +30,7 @@ public abstract class ChunkMapDistance {
@@ -173,11 +173,11 @@ index 7a8397815a..8aae0b63e5 100644
long j = this.a.b();
diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
index 4b87ca2ecb..346e2ebc79 100644
index 6e0d0a54a2..07f77dbb87 100644
--- a/src/main/java/net/minecraft/server/TicketType.java
+++ b/src/main/java/net/minecraft/server/TicketType.java
@@ -23,6 +23,7 @@ public class TicketType<T> {
public static final TicketType<org.bukkit.plugin.Plugin> PLUGIN_TICKET = a("plugin_ticket", (plugin1, plugin2) -> plugin1.getClass().getName().compareTo(plugin2.getClass().getName())); // CraftBukkit
@@ -24,6 +24,7 @@ public class TicketType<T> {
public static final TicketType<Long> FUTURE_AWAIT = a("future_await", Long::compareTo); // Paper
public static final TicketType<Integer> ANTIXRAY = a("antixray", Integer::compareTo); // Paper - Anti-Xray
public static final TicketType<Long> ASYNC_LOAD = a("async_load", Long::compareTo); // Paper
+ public static final TicketType<Long> DELAYED_UNLOAD = a("delayed_unload", Long::compareTo); // Purpur

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

@@ -1,4 +1,4 @@
From eee0baf2a50d6d122b8a33bc530da14dca1b6b01 Mon Sep 17 00:00:00 2001
From 36dab1ca8492e3b84c18556e6a02c0e31dfd10cb 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 3c8acd884a..b879d5f87a 100644
index 51fc57100e..1ef742fd6b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1098,7 +1098,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1086,7 +1086,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
protected boolean canExecute(TickTask ticktask) {

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

@@ -1,4 +1,4 @@
From ce1df0f5e6116252c28393ab7813dac55252e08b Mon Sep 17 00:00:00 2001
From 106272c3f804e9edb2956ca90b3858b95ef2824b 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 b879d5f87a..2e2d298b7d 100644
index 1ef742fd6b..92859c4322 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 b879d5f87a..2e2d298b7d 100644
private ServerConnection serverConnection;
public final WorldLoadListenerFactory worldLoadListenerFactory;
private final ServerPing serverPing = new ServerPing();
@@ -1446,6 +1446,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1434,6 +1434,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 b879d5f87a..2e2d298b7d 100644
/*
dedicatedserver.i((String) optionset.valueOf(optionspec7));
dedicatedserver.setPort((Integer) optionset.valueOf(optionspec10));
@@ -1871,6 +1873,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -1859,6 +1861,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
public abstract boolean a(EnumGamemode enumgamemode, boolean flag, int i);