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@1cda66e Hotfix Entity isInRain reobf issue
PaperMC/Paper@61768e0 [ci skip] Remove no longer needed mappings change
PaperMC/Paper@e035fd7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@c215ce1 [ci skip] cleanup patch diff from last commit
This commit is contained in:
granny
2023-12-25 18:45:01 -08:00
parent 6aec125590
commit 10685bb957
24 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0263-Remove-Timings.patch
View File

@@ -236,10 +236,10 @@ index 8a4037fd2bd679b9952213e6bcd3e96ce589e8c6..0d3d62620659d7897d4ad92147255a99
@Override
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index caa73632aee15583c6b6ed12a668c8f49b794708..c5a4a6a61c160e1cc29ee3c7d03debc0f51ce204 100644
index d9cd497bc1b654030ff1a597f038b6a881df9f6b..c2f3f9ea436faed6bb52369136384e086aa1237e 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -548,15 +548,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -547,15 +547,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
protected void tick(BooleanSupplier shouldKeepTicking) {
ProfilerFiller gameprofilerfiller = this.level.getProfiler();
@@ -259,7 +259,7 @@ index caa73632aee15583c6b6ed12a668c8f49b794708..c5a4a6a61c160e1cc29ee3c7d03debc0
}
gameprofilerfiller.pop();
@@ -1156,24 +1156,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1155,24 +1155,24 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
// Paper start - optimised tracker
private final void processTrackQueue() {
@@ -288,7 +288,7 @@ index caa73632aee15583c6b6ed12a668c8f49b794708..c5a4a6a61c160e1cc29ee3c7d03debc0
}
}
// Paper end - optimised tracker
@@ -1188,7 +1188,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1187,7 +1187,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();
@@ -297,7 +297,7 @@ index caa73632aee15583c6b6ed12a668c8f49b794708..c5a4a6a61c160e1cc29ee3c7d03debc0
ChunkMap.TrackedEntity playerchunkmap_entitytracker;
@@ -1213,17 +1213,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1212,17 +1212,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
playerchunkmap_entitytracker.serverEntity.sendChanges();
}
}
@@ -731,7 +731,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 aec194669dbb13563a83abb64df2f0b64cc64cc7..214a18320d450fc318593b147e0010c42977d421 100644
index 538cd41c655b6995ea9cc72cf3471a59f3461902..c5486e8c4136dac3d2040841027cc14eecbae6ff 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1311,15 +1311,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -753,7 +753,7 @@ index aec194669dbb13563a83abb64df2f0b64cc64cc7..214a18320d450fc318593b147e0010c4
// Spigot start
// Iterator<TickingBlockEntity> iterator = this.blockEntityTickers.iterator();
boolean flag = this.tickRateManager().runsNormally();
@@ -1354,7 +1354,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1348,7 +1348,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
this.blockEntityTickers.removeAll(toRemove);