Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57: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@eb60bff Create raw chat type as resource file instead of in source (#9226)
PaperMC/Paper@99b311d [ci skip] Clarify where furnace-related events are called (#8753)
PaperMC/Paper@83cfeb1 Improve java version check (#9692)
PaperMC/Paper@deb92c2 Add ItemStack#isEmpty and related methods (#9664)
PaperMC/Paper@0c8e84c Enforce sign line nullability when setting line with Adventure Method (#9689)
PaperMC/Paper@ede9c06 Fix Projectile#setOwner(null) not clearing owner (#9715)
PaperMC/Paper@e312ebb Add DISPLAY tracking range type (#9668)
PaperMC/Paper@06a741d Fix leashed pets teleporting to owner when loaded (#9686)
PaperMC/Paper@064fb50 Cleanup old async commands patch (#8895)
PaperMC/Paper@d8af99a Fix silent equipment change for mobs (#9677)
PaperMC/Paper@3cec9c9 [ci skip] Add missing javadoc links (#9497)
PaperMC/Paper@ba0e1f5 Fix sapling observer detection and grow event (#9654)
PaperMC/Paper@a856073 Fix two beacon bugs (#9675)
PaperMC/Paper@581b683 Fix spigot's Forced-Stats (#9663)
This commit is contained in:
granny
2023-09-16 21:46:19 -07:00
parent 07b13f287c
commit b0a7353a70
30 changed files with 228 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0268-Remove-Timings.patch
View File

@@ -258,10 +258,10 @@ index 38e2c279d6a846a4d76c15e495bdf464bfcd5b96..1d67581af0a8cc417ddf5d0a9e68e83c
@Override
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 3770ced0b227f7eea1f04d6afd5c14331f6a1480..f4e1fc878ecf72dafade1c72869c9656a0c5b8aa 100644
index d60ae9f8d3afe3e996a66331ee510cfa5841388c..2d8dbcab5760d4b1879d17642c8e3b2658e4d7ec 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -639,15 +639,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -642,15 +642,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
protected void tick(BooleanSupplier shouldKeepTicking) {
ProfilerFiller gameprofilerfiller = this.level.getProfiler();
@@ -281,7 +281,7 @@ index 3770ced0b227f7eea1f04d6afd5c14331f6a1480..f4e1fc878ecf72dafade1c72869c9656
}
gameprofilerfiller.pop();
@@ -1269,24 +1269,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1272,24 +1272,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
// Paper start - optimised tracker
private final void processTrackQueue() {
@@ -310,7 +310,7 @@ index 3770ced0b227f7eea1f04d6afd5c14331f6a1480..f4e1fc878ecf72dafade1c72869c9656
}
}
// Paper end - optimised tracker
@@ -1301,7 +1301,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1304,7 +1304,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
List<ServerPlayer> list = Lists.newArrayList();
List<ServerPlayer> list1 = this.level.players();
ObjectIterator objectiterator = this.entityMap.values().iterator();
@@ -319,7 +319,7 @@ index 3770ced0b227f7eea1f04d6afd5c14331f6a1480..f4e1fc878ecf72dafade1c72869c9656
ChunkMap.TrackedEntity playerchunkmap_entitytracker;
@@ -1326,17 +1326,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1329,17 +1329,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
playerchunkmap_entitytracker.serverEntity.sendChanges();
}
}
@@ -643,19 +643,19 @@ index 122defeec159165c5fef295ec1dd2da4a6ada622..5b7507db055d7be59b369f66e659e128
} 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 b1050654cca5ce8a834c9e913b8e804609499aa9..5feaf5bb7e366f593d5700fb78243a824ce97f9c 100644
index c2d8d653c7aea674e2efbf60d172da5d2c69758f..dfc84223a083890cd78b77029e1f85eb23f66229 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2641,7 +2641,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@@ -2620,7 +2620,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
public void handleCommand(String s) { // Paper - private -> public
org.spigotmc.AsyncCatcher.catchOp("Command Dispatched Async: " + s); // Paper - Add async catcher
- co.aikar.timings.MinecraftTimings.playerCommandTimer.startTiming(); // Paper
+ //co.aikar.timings.MinecraftTimings.playerCommandTimer.startTiming(); // Paper // Purpur
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2651,7 +2651,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2630,7 +2630,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -664,7 +664,7 @@ index b1050654cca5ce8a834c9e913b8e804609499aa9..5feaf5bb7e366f593d5700fb78243a82
return;
}
@@ -2664,7 +2664,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2643,7 +2643,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 {
@@ -745,7 +745,7 @@ index fcdb9bde8e1605e30dde3e580491522d4b62cdc0..7094701d213c73ba47ace806962244c1
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 66ab51af8cec927835a62fcde9f79090ecad50ae..bd3403428ed721de913c86f508e8cc9349579913 100644
index 2832776269971f3e3b689f8d16b2058d815cf5ba..233980edc80fa0f15756f6d16b76b1f84bd79920 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1015,15 +1015,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {