mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6457)

Browse source 
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:
c9a46ebf #653: Add World#spawn with randomizeData parameter
e49c2e3a Damageable should extend ItemMeta
01ff04f4 SPIGOT-5880, SPIGOT-5567: New ChunkGenerator API
ca5b4b1a SPIGOT-6697: Deprecate generateTree with BlockChangeDelegate as it does not handle tiles

CraftBukkit Changes:
7c8bbcbe SPIGOT-6716: Preserve the order of stored enchantments of enchanted books.
18027d02 #914: Add World#spawn with randomizeData parameter
3cad0316 SPIGOT-6714: Don't fire PlayerBucketEvent when empty
8c6d60cf Fix server crash with BlockPopulator when entities are at a negative chunk border
4f6bcc84 SPIGOT-5880, SPIGOT-5567: New ChunkGenerator API
78d5b35b SPIGOT-6697: Restore generateTree with BlockChangeDelegate behaviour
15792f0d Rebuild patch
c949675e SPIGOT-6713: Cancelling EntityTransformEvent Causes Deceased Slimes To Not Despawn
a955f15c Fix issues with new ChunkGenerator API
a0a37f41 SPIGOT-6630: Replacing an enchantment on an item creates a conflict error

Spigot Changes:
b166a49b Rebuild patches
3c1fc60a SPIGOT-6693: Composters only take in one item at custom hopper speeds
This commit is contained in:
Nassim Jahnke 2021-08-25 09:59:26 +02:00 • committed by GitHub
parent 61a09c5102
commit 789bc79280
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
203 changed files with 766 additions and 822 deletions
Download patch file Download diff file Expand all files Collapse all files

12
patches/server/0396-Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch
View file

@ -246,10 +246,10 @@ index 6f33d4f4ca86bfcad907b451a56e71de0d4585d5..228ff4b52a017e8af987f60d84b7906c
Collections.shuffle(list);
//Paper start - call player naturally spawn event
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a4d05aeccc142808981f1ecebd001c905ae721ed..e6b7302554b2a54363d55e149744237679262174 100644
index d347f8f3bfe7ed0492dd0cd593837ee2246527aa..059b901e79cf0e2d152375453d36437a43c4f244 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -288,6 +288,7 @@ public class CraftWorld implements World {
@@ -146,6 +146,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public int getTileEntityCount() {
@ -257,7 +257,7 @@ index a4d05aeccc142808981f1ecebd001c905ae721ed..e6b7302554b2a54363d55e1497442376
// We don't use the full world tile entity list, so we must iterate chunks
Long2ObjectLinkedOpenHashMap<ChunkHolder> chunks = world.getChunkSource().chunkMap.visibleChunkMap;
int size = 0;
@@ -299,6 +300,7 @@ public class CraftWorld implements World {
@@ -157,6 +158,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
size += chunk.blockEntities.size();
}
return size;
@ -265,7 +265,7 @@ index a4d05aeccc142808981f1ecebd001c905ae721ed..e6b7302554b2a54363d55e1497442376
}
@Override
@@ -308,6 +310,7 @@ public class CraftWorld implements World {
@@ -166,6 +168,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public int getChunkCount() {
@ -273,7 +273,7 @@ index a4d05aeccc142808981f1ecebd001c905ae721ed..e6b7302554b2a54363d55e1497442376
int ret = 0;
for (ChunkHolder chunkHolder : world.getChunkSource().chunkMap.visibleChunkMap.values()) {
@@ -316,7 +319,7 @@ public class CraftWorld implements World {
@@ -174,7 +177,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
}
@ -282,7 +282,7 @@ index a4d05aeccc142808981f1ecebd001c905ae721ed..e6b7302554b2a54363d55e1497442376
}
@Override
@@ -443,6 +446,14 @@ public class CraftWorld implements World {
@@ -302,6 +305,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public Chunk[] getLoadedChunks() {