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@b560034 Avoid usages of RecipeChoice#getItemStack() (#8453)
PaperMC/Paper@603df98 FIx bedrock patterns (#8474)
PaperMC/Paper@ec00f99 Fix package for PlayerInventorySlotChangeEvent (#8475)
PaperMC/Paper@236a296 Add LivingEntity#swingHand(EquipmentSlot) convenience method (#8456)
PaperMC/Paper@7d64d7c Add converted Slot number to PlayerInventorySlotChangeEvent (#8482)
PaperMC/Paper@ed2c88b Add LivingEntity knockback API (#8479)
PaperMC/Paper@e1d4b26 Fix another case of missing chat headers
PaperMC/Paper@f7da209 Fix inconsistent isChunkLoaded calls
This commit is contained in:
BillyGalbreath
2022-10-18 11:18:02 -05:00
parent 8e04c6f326
commit cf6b7c3459
15 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0288-Remove-Timings.patch
View File

@@ -21,10 +21,10 @@ index 8dc1d2d15d571d1603a41dee13681a87841f5e23..54ec7955ba394e82663b08972dd89f69
private static final ThreadLocal<List<ChunkProgressionTask>> CURRENT_TICKET_UPDATE_SCHEDULING = new ThreadLocal<>();
diff --git a/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java b/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java
index dd9c1d68a2bc42467b4566953aaed028bddf0f74..4172d93a73c373482159b48b76200176267b1b19 100644
index f20faaec3f1fe311b3ac989be5a9148e2e3c59ad..e3fcbdbbf1972c382cbfe69a86eddff3dee4fba2 100644
--- a/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java
+++ b/src/main/java/io/papermc/paper/chunk/system/scheduling/NewChunkHolder.java
@@ -1747,7 +1747,7 @@ public final class NewChunkHolder {
@@ -1748,7 +1748,7 @@ public final class NewChunkHolder {
boolean canSavePOI = !(chunk instanceof LevelChunk levelChunk && levelChunk.mustNotSave) && (poi != null && poi.isDirty());
boolean canSaveEntities = entities != null;
@@ -33,7 +33,7 @@ index dd9c1d68a2bc42467b4566953aaed028bddf0f74..4172d93a73c373482159b48b76200176
if (canSaveChunk) {
canSaveChunk = this.saveChunk(chunk, unloading);
}
@@ -1761,7 +1761,7 @@ public final class NewChunkHolder {
@@ -1762,7 +1762,7 @@ public final class NewChunkHolder {
this.lastEntityUnload = null;
}
}
@@ -656,7 +656,7 @@ index 55fe8b0f21f00b02e78257a64fd8d63980d50995..725621bce1b82f44cea1247d12386447
} 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 584744eed27dd3e7f20f4c6d88e931935ecc837b..0064f459e7326d3bc6778fdb7de0a0f8bc080bae 100644
index 799c279e63f23227cb473f7828aeaf7afb0de355..3503b7defe826db564370dbab78a8c91f5156d20 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2603,7 +2603,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -812,10 +812,10 @@ index 386ed2c102aaa3ec68e828e20fff6bfe0d8f7877..c1541119630315521e75c1ba70ac99cd
}
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index df2786516fe641edff7bbe9fe0665bf07502d830..b4460ed16ba30173ad4a5fe8e405e1c34251912f 100644
index 636c98d04eb4e14eab1fa208d9cb097e2ab7eef7..86e0539e04e4fe6239c1cb4c4055927303655251 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -927,7 +927,7 @@ public class LevelChunk extends ChunkAccess {
@@ -930,7 +930,7 @@ public class LevelChunk extends ChunkAccess {
this.chunkHolder.getEntityChunk().callEntitiesLoadEvent(); // Paper - rewrite chunk system
if (this.needsDecoration) {
@@ -824,7 +824,7 @@ index df2786516fe641edff7bbe9fe0665bf07502d830..b4460ed16ba30173ad4a5fe8e405e1c3
this.needsDecoration = false;
java.util.Random random = new java.util.Random();
random.setSeed(this.level.getSeed());
@@ -947,7 +947,7 @@ public class LevelChunk extends ChunkAccess {
@@ -950,7 +950,7 @@ public class LevelChunk extends ChunkAccess {
}
}
server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(this.bukkitChunk));
@@ -833,7 +833,7 @@ index df2786516fe641edff7bbe9fe0665bf07502d830..b4460ed16ba30173ad4a5fe8e405e1c3
}
}
}
@@ -1292,7 +1292,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1295,7 +1295,7 @@ public class LevelChunk extends ChunkAccess {
ProfilerFiller gameprofilerfiller = LevelChunk.this.level.getProfiler();
gameprofilerfiller.push(this::getType);
@@ -842,7 +842,7 @@ index df2786516fe641edff7bbe9fe0665bf07502d830..b4460ed16ba30173ad4a5fe8e405e1c3
BlockState iblockdata = LevelChunk.this.getBlockState(blockposition);
if (this.blockEntity.getType().isValid(iblockdata)) {
@@ -1314,7 +1314,7 @@ public class LevelChunk extends ChunkAccess {
@@ -1317,7 +1317,7 @@ public class LevelChunk extends ChunkAccess {
// Paper end
// Spigot start
} finally {