Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d5f1ffc Remove somewhat broken patch
This commit is contained in:
BillyGalbreath
2022-12-19 11:11:49 -06:00
parent e2365fa207
commit 4a580c4122
39 changed files with 181 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
patches/server/0281-Remove-Timings.patch
View File

@@ -477,10 +477,10 @@ index c6f5d6756fa0e068a462d9c0ded12e0771abba37..2c23321c826d929981df51f2cc60cdcd
// Paper end - use set of chunks requiring updates, rather than iterating every single one loaded
// Paper start - controlled flush for entity tracker packets
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531f20ae4ec 100644
index 077ff3d7620e3c48aca59a92014dbdb7de15e79a..ece55efcd566bcb9b06d305496ab745807cfe975 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -689,7 +689,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -687,7 +687,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.updateSkyBrightness();
this.tickTime();
gameprofilerfiller.popPush("tickPending");
@@ -489,7 +489,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
if (!this.isDebug()) {
j = this.getGameTime();
gameprofilerfiller.push("blockTicks");
@@ -698,20 +698,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -696,20 +696,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.fluidTicks.tick(j, 65536, this::tickFluid);
gameprofilerfiller.pop();
}
@@ -517,7 +517,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
this.handlingTick = false;
gameprofilerfiller.pop();
boolean flag = true || !this.players.isEmpty() || !this.getForcedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players
@@ -722,7 +722,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -720,7 +720,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (flag || this.emptyTime++ < 300) {
gameprofilerfiller.push("entities");
@@ -526,7 +526,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
if (this.dragonFight != null) {
gameprofilerfiller.push("dragonFight");
this.dragonFight.tick();
@@ -730,7 +730,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -728,7 +728,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
org.spigotmc.ActivationRange.activateEntities(this); // Spigot
@@ -535,7 +535,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
this.entityTickList.forEach((entity) -> {
entity.activatedPriorityReset = false; // Pufferfish - DAB
if (!entity.isRemoved()) {
@@ -771,8 +771,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -769,8 +769,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
});
@@ -546,7 +546,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
gameprofilerfiller.pop();
this.tickBlockEntities();
}
@@ -954,7 +954,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -952,7 +952,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Paper start - optimise random block ticking
gameprofilerfiller.popPush("randomTick");
@@ -555,7 +555,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
if (randomTickSpeed > 0) {
LevelChunkSection[] sections = chunk.getSections();
int minSection = io.papermc.paper.util.WorldUtil.getMinSection(this);
@@ -988,7 +988,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -986,7 +986,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
}
}
// Paper end - optimise random block ticking
@@ -564,7 +564,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
gameprofilerfiller.pop();
}
@@ -1281,8 +1281,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1279,8 +1279,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot end
// Paper start- timings
final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(entity);
@@ -575,7 +575,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
// Paper end - timings
entity.setOldPosAndRot();
ProfilerFiller gameprofilerfiller = this.getProfiler();
@@ -1298,7 +1298,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1296,7 +1296,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
entity.postTick(); // CraftBukkit
} else { entity.inactiveTick(); } // Paper - EAR 2
this.getProfiler().pop();
@@ -584,7 +584,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
Iterator iterator = entity.getPassengers().iterator();
while (iterator.hasNext()) {
@@ -1321,8 +1321,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1319,8 +1319,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (passenger instanceof Player || this.entityTickList.contains(passenger)) {
// Paper - EAR 2
final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(passenger);
@@ -595,7 +595,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
// Paper end
passenger.setOldPosAndRot();
++passenger.tickCount;
@@ -1352,7 +1352,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1350,7 +1350,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.tickPassenger(passenger, entity2);
}
@@ -604,7 +604,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
}
} else {
passenger.stopRiding();
@@ -1372,14 +1372,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1370,14 +1370,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld()));
}
@@ -622,7 +622,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
// Copied from save()
// CraftBukkit start - moved from MinecraftServer.saveChunks
@@ -1391,7 +1391,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1389,7 +1389,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.convertable.saveDataTag(this.server.registryAccess(), this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
}
// CraftBukkit end
@@ -631,7 +631,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
}
// Paper end
@@ -1405,7 +1405,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1403,7 +1403,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (!savingDisabled) {
org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
@@ -640,7 +640,7 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
if (progressListener != null) {
progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel"));
}
@@ -1415,11 +1415,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1413,11 +1413,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
progressListener.progressStage(Component.translatable("menu.savingChunks"));
}
@@ -656,10 +656,10 @@ index e2dd2917486ccdadc20de7df7b82f22fd3459fd3..6169078be600a850d68c437a33fb5531
} else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 6dfb1474278329231c1e64d48a9d895b45e07d0c..fd835cd58213078df4a5a53ce710263d564644d1 100644
index 89bafc725eceaf5c8ce1beeb2cdb6c0107ad7e46..92efc48a2cda63b6fac73261c12d12e58a11e5ca 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2579,7 +2579,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2575,7 +2575,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@@ -668,7 +668,7 @@ index 6dfb1474278329231c1e64d48a9d895b45e07d0c..fd835cd58213078df4a5a53ce710263d
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2589,7 +2589,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2585,7 +2585,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -677,7 +677,7 @@ index 6dfb1474278329231c1e64d48a9d895b45e07d0c..fd835cd58213078df4a5a53ce710263d
return;
}
@@ -2602,7 +2602,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2598,7 +2598,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
return;
} finally {
@@ -687,10 +687,10 @@ index 6dfb1474278329231c1e64d48a9d895b45e07d0c..fd835cd58213078df4a5a53ce710263d
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 23cea7dd67dd1890a8fd34c294d140b30e89f59c..9cfe4f2ab57f6d17a64eda2c48fb59ab7aa14367 100644
index f3fc72e1ddbb65daaab3b5fe1c6210434a434050..7d5ba99a674855967256b74fd9fd21749dcde8a3 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1297,7 +1297,7 @@ public abstract class PlayerList {
@@ -1220,7 +1220,7 @@ public abstract class PlayerList {
public void saveAll(int interval) {
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -699,7 +699,7 @@ index 23cea7dd67dd1890a8fd34c294d140b30e89f59c..9cfe4f2ab57f6d17a64eda2c48fb59ab
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1308,7 +1308,7 @@ public abstract class PlayerList {
@@ -1231,7 +1231,7 @@ public abstract class PlayerList {
}
// Paper end
}