Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +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@7a96bf2 Make debug dump file names consistent (#9075)
PaperMC/Paper@1704bf7 Edit Paper download link in README (#9077)
PaperMC/Paper@5fb3ab0 Allow non player entities in scoreboards by default (#9082)
PaperMC/Paper@dc08c74 Remove duplicate animate packet for records (#8600)
PaperMC/Paper@50e683d Added a config option for ticking markers (#9034)
PaperMC/Paper@1d2fe64 fix: null SpawnReason for new player (#9015)
PaperMC/Paper@9893e2b Deprecate ChatColor (#9069)
PaperMC/Paper@0849144 Do not send expired keys to players on login (#9090)
PaperMC/Paper@641dafd Cleanup some patches (#9093)
PaperMC/Paper@497b919 Fix ignoreCancelled having no effect on events registered by direct EventExecutor (#9099)
This commit is contained in:
granny
2023-04-04 15:02:33 -07:00
parent bd5c4b67e6
commit 285f9f683d
30 changed files with 112 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0276-Remove-Timings.patch
View File

@@ -471,7 +471,7 @@ index 8438354e482b6f892c3344eceff1abd23cfa128a..7dde0357d0c63469176a44d84631c52e
// 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 e0951fd02868f04bb12afab15b73b6d41e814abd..74ab15db63acae728a55ad2cde40ae9bfa3003f3 100644
index b3226f53559da2cdc2b74b02cd89921e6001556a..2d367377ac024b6ab3d9072813d03ad36db5a22d 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -687,7 +687,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -650,10 +650,10 @@ index e0951fd02868f04bb12afab15b73b6d41e814abd..74ab15db63acae728a55ad2cde40ae9b
} 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 82ecca48fdb1bffc87ec21b569725d87fbfb7325..517b70c1c421d48de775d92c4383e40a48fd53a8 100644
index ea3bfb5f639d5d3357111c82a974a8de1e9e178f..43a5eb13728bee99cdf87947d98c042689d1af53 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2573,7 +2573,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2581,7 +2581,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@@ -662,7 +662,7 @@ index 82ecca48fdb1bffc87ec21b569725d87fbfb7325..517b70c1c421d48de775d92c4383e40a
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2583,7 +2583,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2591,7 +2591,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -671,7 +671,7 @@ index 82ecca48fdb1bffc87ec21b569725d87fbfb7325..517b70c1c421d48de775d92c4383e40a
return;
}
@@ -2596,7 +2596,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2604,7 +2604,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 {
@@ -681,10 +681,10 @@ index 82ecca48fdb1bffc87ec21b569725d87fbfb7325..517b70c1c421d48de775d92c4383e40a
}
// 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 bd3e2345929d1dc5c126e2506c6569e1a41ebf4d..1a288ebcaade0cc44c7d09478f4f2f8eee7a4269 100644
index 71d3a4c16e80bf16d8c5841a04c532c1f69c0c0b..b04e905534baf35e50d9d09921581e04edd19fc5 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1235,7 +1235,7 @@ public abstract class PlayerList {
@@ -1239,7 +1239,7 @@ public abstract class PlayerList {
public void saveAll(int interval) {
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -693,7 +693,7 @@ index bd3e2345929d1dc5c126e2506c6569e1a41ebf4d..1a288ebcaade0cc44c7d09478f4f2f8e
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1246,7 +1246,7 @@ public abstract class PlayerList {
@@ -1250,7 +1250,7 @@ public abstract class PlayerList {
}
// Paper end
}
@@ -923,7 +923,7 @@ index 138407c2d4b0bc55ddb9aac5d2aa3edadda090fb..a6e9e503a496c18e2501b03ec84f4600
// Paper end - add timings for scoreboard search
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 00744aceb25ddc689b8c5ed90ae27e1ea28057ad..665625c69b93a2568b1f2218a0db39da435d8c99 100644
index d9448a222bbe2cbd09debfb93f339b175ed44c92..ee64ddb0da23ea1e54d0295324aca5b46a438111 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -170,7 +170,7 @@ public class ActivationRange
@@ -935,7 +935,7 @@ index 00744aceb25ddc689b8c5ed90ae27e1ea28057ad..665625c69b93a2568b1f2218a0db39da
final int miscActivationRange = world.spigotConfig.miscActivationRange;
final int raiderActivationRange = world.spigotConfig.raiderActivationRange;
final int animalActivationRange = world.spigotConfig.animalActivationRange;
@@ -244,7 +244,7 @@ public class ActivationRange
@@ -245,7 +245,7 @@ public class ActivationRange
}
// Paper end
}