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 appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@08c0b48 [ci skip] update paperweight to 1.5.7 & re-enable filterpatches (#9799)
PaperMC/Paper@29a0209 Properly check water block when random ticking ice (#9804)
This commit is contained in:
granny
2023-10-06 19:37:50 -07:00
parent fd01882d1f
commit be959650a5
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -427,7 +427,7 @@ index 17b6925b46f8386dcfc561483693de516465ec12..9dc3dec2bdf2e503fe10364dd4bb5cf6
gameprofilerfiller.pop();
gameprofilerfiller.pop();
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index ff9adf5d04ad08342eeca166bd582774bf6f2cdd..1688fdea27342783f91b5cd0a09343ddac77dc6d 100644
index 158e690713204ad2d0b6ff3d0daa1f13a8100f1e..b1f5ccd309f84f7b53d16ad6241bb4cb1bdd0726 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -856,7 +856,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -514,7 +514,7 @@ index ff9adf5d04ad08342eeca166bd582774bf6f2cdd..1688fdea27342783f91b5cd0a09343dd
gameprofilerfiller.pop();
}
@@ -1437,8 +1437,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1438,8 +1438,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot end
// Paper start- timings
final boolean isActive = org.spigotmc.ActivationRange.checkIfActive(entity);
@@ -525,7 +525,7 @@ index ff9adf5d04ad08342eeca166bd582774bf6f2cdd..1688fdea27342783f91b5cd0a09343dd
// Paper end - timings
entity.setOldPosAndRot();
ProfilerFiller gameprofilerfiller = this.getProfiler();
@@ -1454,7 +1454,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1455,7 +1455,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
entity.postTick(); // CraftBukkit
} else { entity.inactiveTick(); } // Paper - EAR 2
this.getProfiler().pop();
@@ -534,7 +534,7 @@ index ff9adf5d04ad08342eeca166bd582774bf6f2cdd..1688fdea27342783f91b5cd0a09343dd
Iterator iterator = entity.getPassengers().iterator();
while (iterator.hasNext()) {
@@ -1477,8 +1477,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1478,8 +1478,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);
@@ -545,7 +545,7 @@ index ff9adf5d04ad08342eeca166bd582774bf6f2cdd..1688fdea27342783f91b5cd0a09343dd
// Paper end
passenger.setOldPosAndRot();
++passenger.tickCount;
@@ -1508,7 +1508,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1509,7 +1509,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.tickPassenger(passenger, entity2);
}
@@ -554,7 +554,7 @@ index ff9adf5d04ad08342eeca166bd582774bf6f2cdd..1688fdea27342783f91b5cd0a09343dd
}
} else {
passenger.stopRiding();
@@ -1528,14 +1528,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1529,14 +1529,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld()));
}
@@ -572,7 +572,7 @@ index ff9adf5d04ad08342eeca166bd582774bf6f2cdd..1688fdea27342783f91b5cd0a09343dd
// Copied from save()
// CraftBukkit start - moved from MinecraftServer.saveChunks
@@ -1547,7 +1547,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1548,7 +1548,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.convertable.saveDataTag(this.server.registryAccess(), this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
}
// CraftBukkit end
@@ -581,7 +581,7 @@ index ff9adf5d04ad08342eeca166bd582774bf6f2cdd..1688fdea27342783f91b5cd0a09343dd
}
// Paper end
@@ -1561,7 +1561,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1562,7 +1562,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (!savingDisabled) {
org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld())); // CraftBukkit
@@ -590,7 +590,7 @@ index ff9adf5d04ad08342eeca166bd582774bf6f2cdd..1688fdea27342783f91b5cd0a09343dd
if (progressListener != null) {
progressListener.progressStartNoAbort(Component.translatable("menu.savingLevel"));
}
@@ -1571,11 +1571,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1572,11 +1572,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
progressListener.progressStage(Component.translatable("menu.savingChunks"));
}
@@ -606,7 +606,7 @@ index ff9adf5d04ad08342eeca166bd582774bf6f2cdd..1688fdea27342783f91b5cd0a09343dd
} 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 87e064670d336f1c3a86cdc524e2686c7ee5af72..9fa25455dd264ea0b58d5e1825fd88475021dea9 100644
index d5f4e95fe5d796c419e5b76042dda638c26d15ed..d01116aa7b547e5020b69df36cdf035af2cae882 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2446,7 +2446,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl