aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1037-Moonrise-optimisation-patches.patch
diff options
context:
space:
mode:
authorBjarne Koll <[email protected]>2024-12-02 18:36:54 +0100
committerBjarne Koll <[email protected]>2024-12-02 18:36:54 +0100
commitb46007fbfa32c08c9228a604b7a66a5897114a81 (patch)
tree94535ef3645529d0471c1ea6b8b9cf1ba31bc0ef /patches/server/1037-Moonrise-optimisation-patches.patch
parentc2294d7067959d264eb8ad275557f194a3e2656f (diff)
downloadPaper-b46007fbfa32c08c9228a604b7a66a5897114a81.tar.gz
Paper-b46007fbfa32c08c9228a604b7a66a5897114a81.zip
Updated Upstream (Bukkit/CraftBukkit/Spigot)upstream-update
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ed0ec489 SPIGOT-7965: Unknown TransformReason for Hoglins 9db03457 SPIGOT-7964: Fix typo in Deprecation annotation d14119af PR-1082: Add "since" to Deprecation annotations e8a318d4 PR-1067: Add method to get Advancement requirements CraftBukkit Changes: 40dd796db SPIGOT-7971: NotSerializableException on serialize CraftUseCooldownComponent fa85c5e0a SPIGOT-7968: ProjectileHitEvent not trigerred when arrow hits entity b75b792ec SPIGOT-7970: World#getMaxHeight() returning incorrect value 2b9a094bb SPIGOT-7965: Unknown TransformReason for Hoglins fd3f5a380 SPIGOT-7966: Some trees do not generate with #generateTree f2822317c PR-1515: Add a Class reader and Class node argument provider 07abf6852 PR-1514: Add a test case for ClassTraverser a7577cb24 Fix Inventory#addItem not respecting max stack size 066a74e74 PR-1490: Add method to get Advancement requirements 4a1df30e4 PR-1512: Test Art class based on specific values instead of the implementation, to better catch implementation changes 53254c56f PR-1503: Simplify CAS loop to getAndSet e9447dc5e Make BlockDataMeta#setBlockData hide unspecified states dd08a7120 SPIGOT-7960: Fix inconsistency between natural item drop coordinates e9e8ed753 SPIGOT-7960: Improve natural item drop methods Spigot Changes: 60c9969b Rebuild patches
Diffstat (limited to 'patches/server/1037-Moonrise-optimisation-patches.patch')
-rw-r--r--patches/server/1037-Moonrise-optimisation-patches.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/server/1037-Moonrise-optimisation-patches.patch b/patches/server/1037-Moonrise-optimisation-patches.patch
index c2bbb5a373..b5ede9fb6a 100644
--- a/patches/server/1037-Moonrise-optimisation-patches.patch
+++ b/patches/server/1037-Moonrise-optimisation-patches.patch
@@ -36177,10 +36177,10 @@ index 87477ad186b5f692a39f323a618d016b669d8051..1df118625aeb57f3353c40f9552f00d2
// Paper start - Adventure
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4a5a0e33af16369f665bf39e70238e4e5a5486da..696152286a4d16fa51a23ff6e15fb297f3476007 100644
+index cd2e74ebadc1aa8282b3d5b89696ddbc053b2708..2abe37bfbe69c039433b11fcc3a1d4f4e7481ec8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -488,10 +488,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -489,10 +489,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
ChunkHolder playerChunk = this.world.getChunkSource().chunkMap.getVisibleChunkIfPresent(ChunkPos.asLong(x, z));
if (playerChunk == null) return false;
@@ -36198,7 +36198,7 @@ index 4a5a0e33af16369f665bf39e70238e4e5a5486da..696152286a4d16fa51a23ff6e15fb297
// Paper start - Anti-Xray bypass
final Map<Object, ClientboundLevelChunkWithLightPacket> refreshPackets = new HashMap<>();
-@@ -504,8 +508,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -505,8 +509,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}));
// Paper end - Anti-Xray bypass
}
@@ -36208,7 +36208,7 @@ index 4a5a0e33af16369f665bf39e70238e4e5a5486da..696152286a4d16fa51a23ff6e15fb297
return true;
}
-@@ -609,20 +612,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -610,20 +613,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public Collection<Plugin> getPluginChunkTickets(int x, int z) {
DistanceManager chunkDistanceManager = this.world.getChunkSource().chunkMap.distanceManager;
@@ -36230,7 +36230,7 @@ index 4a5a0e33af16369f665bf39e70238e4e5a5486da..696152286a4d16fa51a23ff6e15fb297
}
@Override
-@@ -630,7 +621,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -631,7 +622,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
Map<Plugin, ImmutableList.Builder<Chunk>> ret = new HashMap<>();
DistanceManager chunkDistanceManager = this.world.getChunkSource().chunkMap.distanceManager;
@@ -36239,7 +36239,7 @@ index 4a5a0e33af16369f665bf39e70238e4e5a5486da..696152286a4d16fa51a23ff6e15fb297
long chunkKey = chunkTickets.getLongKey();
SortedArraySet<Ticket<?>> tickets = chunkTickets.getValue();
-@@ -1333,12 +1324,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -1334,12 +1325,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public int getViewDistance() {
@@ -36254,7 +36254,7 @@ index 4a5a0e33af16369f665bf39e70238e4e5a5486da..696152286a4d16fa51a23ff6e15fb297
}
public BlockMetadataStore getBlockMetadata() {
-@@ -2473,17 +2464,20 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2474,17 +2465,20 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public void setSimulationDistance(final int simulationDistance) {