Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-06-25 06:14:50 +02:00
Code Issues Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit)

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:
b302317a SPIGOT-5877: Add scaffolding for custom dimensions and biomes
ccccb625 SPIGOT-6417: Add Creeper fuse ticks API

CraftBukkit Changes:
0e26ddb6 SPIGOT-5877: Add scaffolding for custom dimensions and biomes
170d6feb SPIGOT-6417: Add Creeper fuse ticks API
This commit is contained in:
Jake Potrebic 2021-04-11 01:49:43 -07:00 committed by Mariell Hoversholm
parent de138fac4e
commit a981965852
25 changed files with 57 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Spigot-API-Patches/0140-Add-More-Creeper-API.patch
View File

@ -65,10 +65,10 @@ index 0000000000000000000000000000000000000000..ff10251b6ded533b08048ec533525176
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java
index 1b8ece6dfd64c4913dc997fe7ad2fc01975af8c7..faaeb44a99f26dfd1465f0021c75d4c349beaa3e 100644
index 5793193d93d76a062fd0431475c269c4978ec993..e144f618702122bf28ebedc5cb8ce0f6ef27c107 100644
--- a/src/main/java/org/bukkit/entity/Creeper.java
+++ b/src/main/java/org/bukkit/entity/Creeper.java
@@ -71,4 +71,27 @@ public interface Creeper extends Monster {
@@ -87,4 +87,20 @@ public interface Creeper extends Monster {
* griefing gamerule.
*/
public void ignite();
@ -87,12 +87,5 @@ index 1b8ece6dfd64c4913dc997fe7ad2fc01975af8c7..faaeb44a99f26dfd1465f0021c75d4c3
+ * @return Ignited state
+ */
+ public boolean isIgnited();
+
+ /**
+ * Get the number of ticks this creeper has been ignited (armed to explode)
+ *
+ * @return Ticks creeper has been ignited
+ */
+ public int getFuseTicks();
+ // Paper end
}

8
Spigot-Server-Patches/0137-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
View File

@ -101,7 +101,7 @@ index a17812943b5402684c68ddeac5408dc939e42cf6..f4da22b33c704e675510b4b1a3aa7c18
@Override
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index ecb07130be80b484e0f2241a368db967775148e8..6fa269cec002fcffd6d02125c20efa9314148243 100644
index dc715a0275b148c3c66610d6fb873626180c82d5..b66b340fdef9423ad8dce290065e028a0c135ea8 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -1594,7 +1594,8 @@ public abstract class EntityLiving extends Entity {
@ -180,7 +180,7 @@ index 3604fffb9ba13a019e98e0a1a0ef7ba81c8dc329..adce6f17a5dd33004f8a67cd55d195de
}
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillagerTrader.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillagerTrader.java
index 8fd2cfe264bbf49a489eb34e7b6505b3f2080f8c..e03796372ee0795e29918a7abd8e0a8756e0be96 100644
index 46da22aeef6132a96e413301935c4fef7a96e0ee..4f81a97b1451fec0bb5fd1479acad97846c40c7c 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillagerTrader.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillagerTrader.java
@@ -189,7 +189,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@ -278,10 +278,10 @@ index 9744d51a52c5eb99c4cf9e36d9380c49674dd136..deaa4c136c23dc6c258cc1ce68523b3c
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 6d78b243d712b2f152ada8b5e7375545b96a76c7..4e255f2ca75ac0c1e1572f312a669cb6d3b60121 100644
index fa2e17e925a32294f194e37ba80934a129e1e903..cc78f71c5d8124c0edf3d700af15df025a0bb349 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1841,7 +1841,7 @@ public class CraftWorld implements World {
@@ -1842,7 +1842,7 @@ public class CraftWorld implements World {
} else if (TNTPrimed.class.isAssignableFrom(clazz)) {
entity = new EntityTNTPrimed(world, x, y, z, null);
} else if (ExperienceOrb.class.isAssignableFrom(clazz)) {

4
Spigot-Server-Patches/0213-Expand-World.spawnParticle-API-and-add-Builder.patch
View File

@ -43,10 +43,10 @@ index 6137a88e1dc8d19a4e35ad97500dabeddba008a8..96d67fc3cbe61c1fb6e639b1838b2fd1
if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 671589aa0aeec98134d3ef0676193db1ec6f6015..a90d59990bb86739b201a88e5623d1c2ddcee1be 100644
index cc78f71c5d8124c0edf3d700af15df025a0bb349..89858fe2e0258dd93176afcfe39beda2cdc5d432 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2358,11 +2358,17 @@ public class CraftWorld implements World {
@@ -2359,11 +2359,17 @@ public class CraftWorld implements World {
@Override
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {

4
Spigot-Server-Patches/0217-Allow-spawning-Item-entities-with-World.spawnEntity.patch
View File

@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
Item can be set inside of the Consumer pre spawn function.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 9b64aad8834d9e9047331415bd4fc18800eac734..d41bf389bf64d8548ea6eda67429404dc9f19ede 100644
index 89858fe2e0258dd93176afcfe39beda2cdc5d432..56ef4cd95ab9d8a21ba45f3170cdc214182966fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1521,6 +1521,10 @@ public class CraftWorld implements World {
@@ -1522,6 +1522,10 @@ public class CraftWorld implements World {
if (Boat.class.isAssignableFrom(clazz)) {
entity = new EntityBoat(world, x, y, z);
entity.setPositionRotation(x, y, z, yaw, pitch);

4
Spigot-Server-Patches/0221-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
Otherwise the creeper infinite explodes
diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java b/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
index e3124c46f740df3a24b22128d50ce7efb7d76f17..ea15f54b70361bca529936e6d2e9bc555c60a657 100644
index 08292753f925f33d75f3aca835c1fd19494b22ec..cbb973e077e04e5221bcc837f434b7093bdbcc2a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
@@ -48,7 +48,7 @@ public class EntityCreeper extends EntityMonster {
@ -16,7 +16,7 @@ index e3124c46f740df3a24b22128d50ce7efb7d76f17..ea15f54b70361bca529936e6d2e9bc55
- private static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i);
+ private static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i); private static final DataWatcherObject<Boolean> isIgnitedDW = d; // Paper OBFHELPER
private int bo;
private int fuseTicks;
public int fuseTicks; // PAIL
public int maxFuseTicks = 30;
@@ -253,6 +253,7 @@ public class EntityCreeper extends EntityMonster {
this.createEffectCloud();

4
Spigot-Server-Patches/0233-Implement-World.getEntity-UUID-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Implement World.getEntity(UUID) API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 6167c284b08636452519cbff43d2807ea0575bd5..1bb6ed364cdde01fe54553cfad8ec4256789620b 100644
index 0542623a0157e7df9717e3e641e34a6b8527d835..284a554eb3d94c9b0807d6c84aafaa4680d671ea 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1310,6 +1310,15 @@ public class CraftWorld implements World {
@@ -1311,6 +1311,15 @@ public class CraftWorld implements World {
return list;
}

10
Spigot-Server-Patches/0254-Ignore-Dead-Entities-in-entityList-iteration.patch
View File

@ -83,10 +83,10 @@ index e4accac8f2e8daa58f9b0c279ffcad9347448bb0..79ff96f18c53f3d1ce4a00be2e2d8fe6
if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
list.add(t0);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d85e1e95b99c6d8b618ac0094d46caf6a38a59c6..2c2343ad815a4baee22f92fda426180b56d18fae 100644
index 284a554eb3d94c9b0807d6c84aafaa4680d671ea..d62522e731656e21ed3cc4f7aa4b6de3d84031fc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1046,6 +1046,7 @@ public class CraftWorld implements World {
@@ -1047,6 +1047,7 @@ public class CraftWorld implements World {
for (Object o : world.entitiesById.values()) {
if (o instanceof net.minecraft.world.entity.Entity) {
net.minecraft.world.entity.Entity mcEnt = (net.minecraft.world.entity.Entity) o;
@ -94,7 +94,7 @@ index d85e1e95b99c6d8b618ac0094d46caf6a38a59c6..2c2343ad815a4baee22f92fda426180b
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -1065,6 +1066,7 @@ public class CraftWorld implements World {
@@ -1066,6 +1067,7 @@ public class CraftWorld implements World {
for (Object o : world.entitiesById.values()) {
if (o instanceof net.minecraft.world.entity.Entity) {
net.minecraft.world.entity.Entity mcEnt = (net.minecraft.world.entity.Entity) o;
@ -102,7 +102,7 @@ index d85e1e95b99c6d8b618ac0094d46caf6a38a59c6..2c2343ad815a4baee22f92fda426180b
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -1091,6 +1093,7 @@ public class CraftWorld implements World {
@@ -1092,6 +1094,7 @@ public class CraftWorld implements World {
for (Object entity: world.entitiesById.values()) {
if (entity instanceof net.minecraft.world.entity.Entity) {
@ -110,7 +110,7 @@ index d85e1e95b99c6d8b618ac0094d46caf6a38a59c6..2c2343ad815a4baee22f92fda426180b
Entity bukkitEntity = ((net.minecraft.world.entity.Entity) entity).getBukkitEntity();
if (bukkitEntity == null) {
@@ -1114,6 +1117,7 @@ public class CraftWorld implements World {
@@ -1115,6 +1118,7 @@ public class CraftWorld implements World {
for (Object entity: world.entitiesById.values()) {
if (entity instanceof net.minecraft.world.entity.Entity) {

19
Spigot-Server-Patches/0275-Add-More-Creeper-API.patch
View File

@ -5,18 +5,9 @@ Subject: [PATCH] Add More Creeper API
diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java b/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
index ea15f54b70361bca529936e6d2e9bc555c60a657..9c8abb18c0ed850939b6691396f5d551e13c7af9 100644
index cbb973e077e04e5221bcc837f434b7093bdbcc2a..b47f71ca1f1c8bbd1a521836d9cb5d676a33ec76 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityCreeper.java
@@ -50,7 +50,7 @@ public class EntityCreeper extends EntityMonster {
private static final DataWatcherObject<Boolean> POWERED = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i);
private static final DataWatcherObject<Boolean> d = DataWatcher.a(EntityCreeper.class, DataWatcherRegistry.i); private static final DataWatcherObject<Boolean> isIgnitedDW = d; // Paper OBFHELPER
private int bo;
- private int fuseTicks;
+ public int fuseTicks; // Paper - public
public int maxFuseTicks = 30;
public int explosionRadius = 3;
private int bs;
@@ -290,7 +290,18 @@ public class EntityCreeper extends EntityMonster {
}
@ -38,10 +29,10 @@ index ea15f54b70361bca529936e6d2e9bc555c60a657..9c8abb18c0ed850939b6691396f5d551
public boolean canCauseHeadDrop() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
index 013e0b1bca7cb348316bf3917455b160af0c57cc..8499a37611d7bb4f0a6598d6e78de1d52ae5ea02 100644
index 167b8f0c742be07ee0c5d698e04d6e29addda70c..629518d4bb314a1d46e32397b6fb7b90bce94e83 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java
@@ -88,4 +88,18 @@ public class CraftCreeper extends CraftMonster implements Creeper {
@@ -101,4 +101,14 @@ public class CraftCreeper extends CraftMonster implements Creeper {
public EntityType getType() {
return EntityType.CREEPER;
}
@ -54,9 +45,5 @@ index 013e0b1bca7cb348316bf3917455b160af0c57cc..8499a37611d7bb4f0a6598d6e78de1d5
+ public boolean isIgnited() {
+ return getHandle().isIgnited();
+ }
+
+ public int getFuseTicks() {
+ return getHandle().fuseTicks;
+ }
+ // Paper end
}

4
Spigot-Server-Patches/0353-Configurable-Keep-Spawn-Loaded-range-per-world.patch
View File

@ -221,10 +221,10 @@ index 872d00de41533ab7f4b43874de6c1747022e2ac5..ca81664d884e80e5cb1eb376a2c2ef1e
@Override
public void a(ChunkCoordIntPair chunkcoordintpair) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d17d77dd9e059bafc3b59ac12f601f9d54226829..c19ac8c28a799bebf68f098171cefd0fc3ec3f0b 100644
index ef012b51bc4555ab38ad06de694d8f7c946e911a..fc339e1f15b75736af70a02591c7be8b9b39423b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1978,15 +1978,21 @@ public class CraftWorld implements World {
@@ -1979,15 +1979,21 @@ public class CraftWorld implements World {
@Override
public void setKeepSpawnInMemory(boolean keepLoaded) {

4
Spigot-Server-Patches/0356-Implement-CraftBlockSoundGroup.patch
View File

@ -66,10 +66,10 @@ index 0987b25ac586d5d7b7954256c740fdf736498dae..b2a52c6bad5a83f34188b8f3db18c61f
public SoundEffectType(float f, float f1, SoundEffect soundeffect, SoundEffect soundeffect1, SoundEffect soundeffect2, SoundEffect soundeffect3, SoundEffect soundeffect4) {
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index e4fe55bb830cd43680de9d61652448b1ea879063..38122a0ae08667e69cf2eb78d36208bb19441554 100644
index 783e470097239f65d0375295fb68438f2fa75b73..aab855c64507e4a695c1be8693522b91b24b9cdd 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -738,4 +738,11 @@ public class CraftBlock implements Block {
@@ -739,4 +739,11 @@ public class CraftBlock implements Block {
AxisAlignedBB aabb = shape.getBoundingBox();
return new BoundingBox(getX() + aabb.minX, getY() + aabb.minY, getZ() + aabb.minZ, getX() + aabb.maxX, getY() + aabb.maxY, getZ() + aabb.maxZ);
}

4
Spigot-Server-Patches/0369-Asynchronous-chunk-IO-and-loading.patch
View File

@ -4060,7 +4060,7 @@ index 8ad97a8a2189553da88810380b1c240079eacc93..d3b9a9e4695655860c72db5f21884726
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 57e8b8078aaa92d0869ab2aeb17a5f53c5e7b2bb..ca341a45eff7bf6c57d45a9b460a208f16925b7b 100644
index 2855dbefac9308c043da85d7ddba2fd741a1fbe0..91b8e555f54e60f3839ef3d523bf7d2aef6c253b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -563,22 +563,23 @@ public class CraftWorld implements World {
@ -4095,7 +4095,7 @@ index 57e8b8078aaa92d0869ab2aeb17a5f53c5e7b2bb..ca341a45eff7bf6c57d45a9b460a208f
// fall through to load
// we do this so we do not re-read the chunk data on disk
@@ -2507,6 +2508,34 @@ public class CraftWorld implements World {
@@ -2508,6 +2509,34 @@ public class CraftWorld implements World {
public DragonBattle getEnderDragonBattle() {
return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle());
}

4
Spigot-Server-Patches/0381-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ff6aff979ffaa740a5141ef6dc929fb3368bc194..cc15f27759771c0d839dcc7118ed898cf3617619 100644
index 91b8e555f54e60f3839ef3d523bf7d2aef6c253b..630c709c9e5d3e98e1e895ea91f53aea5b9c0eb2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1892,7 +1892,12 @@ public class CraftWorld implements World {
@@ -1893,7 +1893,12 @@ public class CraftWorld implements World {
height = 9;
}

6
Spigot-Server-Patches/0400-Add-effect-to-block-break-naturally.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add effect to block break naturally
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 38122a0ae08667e69cf2eb78d36208bb19441554..ffa94d23675c6c7b6b005860c99c730aacb94924 100644
index aab855c64507e4a695c1be8693522b91b24b9cdd..650b80b6e38dffa6b6b211cf4ea1125105748935 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -632,6 +632,13 @@ public class CraftBlock implements Block {
@@ -633,6 +633,13 @@ public class CraftBlock implements Block {
@Override
public boolean breakNaturally(ItemStack item) {
@ -22,7 +22,7 @@ index 38122a0ae08667e69cf2eb78d36208bb19441554..ffa94d23675c6c7b6b005860c99c730a
// Order matters here, need to drop before setting to air so skulls can get their data
net.minecraft.world.level.block.state.IBlockData iblockdata = this.getNMS();
net.minecraft.world.level.block.Block block = iblockdata.getBlock();
@@ -641,6 +648,7 @@ public class CraftBlock implements Block {
@@ -642,6 +649,7 @@ public class CraftBlock implements Block {
// Modelled off EntityHuman#hasBlock
if (block != Blocks.AIR && (item == null || !iblockdata.isRequiresSpecialTool() || nmsItem.canDestroySpecialBlock(iblockdata))) {
net.minecraft.world.level.block.Block.dropItems(iblockdata, world.getMinecraftWorld(), position, world.getTileEntity(position), null, nmsItem);

4
Spigot-Server-Patches/0470-No-Tick-view-distance-implementation.patch
View File

@ -699,7 +699,7 @@ index bb2ff043f0d159fa18769c31b08683ee12037c58..90e895e9eac6158a28de4a30589bf753
this.n[i].clear();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 58e1ff5be8408e093f7ac5ea2712f4d1c92e6a76..37d9a17f4161c59459742fd60d1d347cdc6a169c 100644
index 9f38e32a602adac2cb4c1fe48c60628e70431c7b..06d5b1f57caed74af6a5db0ad47b01c55a50291e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -32,6 +32,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutWorldEvent;
@ -710,7 +710,7 @@ index 58e1ff5be8408e093f7ac5ea2712f4d1c92e6a76..37d9a17f4161c59459742fd60d1d347c
import net.minecraft.server.level.Ticket;
import net.minecraft.server.level.TicketType;
import net.minecraft.server.level.WorldServer;
@@ -2556,10 +2557,39 @@ public class CraftWorld implements World {
@@ -2557,10 +2558,39 @@ public class CraftWorld implements World {
// Spigot start
@Override
public int getViewDistance() {

6
Spigot-Server-Patches/0486-Implement-Chunk-Priority-Urgency-System-for-Chunks.patch
View File

@ -1191,7 +1191,7 @@ index 2c932d36f982e7f8713aabff9a6c631055810366..f5d18834e0e2ee0e3bcf55810456766d
public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
return new TicketType<>(s, comparator, 0L);
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 41d4c3533119cc80cb4c93771db344531c8dd106..d8be5ff9620da8d96a0d157fb99145d3b43299df 100644
index 6bf12a4c930d35d0998382aef98e19c057b6826e..8a905851a903fc45da6a5cf4bbd2fe5a7139a6dd 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -1527,6 +1527,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -1246,10 +1246,10 @@ index 9a88791be443a5b18934e7d752aee6dcdb8aa38f..e41d63596c32eee5f0c04a6f043d576d
return new BlockPosition(this.d(), 0, this.e());
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 37d9a17f4161c59459742fd60d1d347cdc6a169c..aa78cbbf909e366a9a23902711453a9b2e1a32c7 100644
index 06d5b1f57caed74af6a5db0ad47b01c55a50291e..ebd648897e309f10091fef2e24e5a6fd07a1c6e9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2547,6 +2547,10 @@ public class CraftWorld implements World {
@@ -2548,6 +2548,10 @@ public class CraftWorld implements World {
return future;
}

4
Spigot-Server-Patches/0495-Add-Plugin-Tickets-to-API-Chunk-Methods.patch
View File

@ -44,7 +44,7 @@ index 32e68e403950be62bd0330b268738225c2e70edd..d0c951878600a4227e558bc68d68098c
printSaveWarning = false;
console.autosavePeriod = configuration.getInt("ticks-per.autosave");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index aa78cbbf909e366a9a23902711453a9b2e1a32c7..611f53f52b4f2d831920df40d48b8bbc61326f1b 100644
index ebd648897e309f10091fef2e24e5a6fd07a1c6e9..d3a1d5e29d01f5c033e5d8ba0998678eba798032 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -30,6 +30,7 @@ import net.minecraft.network.protocol.game.PacketPlayOutCustomSoundEffect;
@ -119,7 +119,7 @@ index aa78cbbf909e366a9a23902711453a9b2e1a32c7..611f53f52b4f2d831920df40d48b8bbc
world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, true);
return true;
// Paper end
@@ -2553,6 +2570,7 @@ public class CraftWorld implements World {
@@ -2554,6 +2571,7 @@ public class CraftWorld implements World {
}
return this.world.getChunkProvider().getChunkAtAsynchronously(x, z, gen, urgent).thenComposeAsync((either) -> {
net.minecraft.world.level.chunk.Chunk chunk = (net.minecraft.world.level.chunk.Chunk) either.left().orElse(null);

4
Spigot-Server-Patches/0537-Add-missing-strikeLighting-call-to-World-spigot-stri.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Add missing strikeLighting call to
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 611f53f52b4f2d831920df40d48b8bbc61326f1b..4a5027d6fbd6c68d0e3b43f74afdd49ffa22188c 100644
index d3a1d5e29d01f5c033e5d8ba0998678eba798032..67b6dc3199d20921bb83c7e1ddd19cdad46b8c61 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2633,6 +2633,7 @@ public class CraftWorld implements World {
@@ -2634,6 +2634,7 @@ public class CraftWorld implements World {
lightning.teleportAndSync( loc.getX(), loc.getY(), loc.getZ() );
lightning.isEffect = true;
lightning.isSilent = isSilent;

4
Spigot-Server-Patches/0565-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
View File

@ -59,10 +59,10 @@ index cc512bd2e89382e7fdbc59b41640e95ccafbbfe9..768934fa4158a9773d06f5b23bfb19db
if (this.name == null) {
this.name = SystemUtils.a("block", IRegistry.BLOCK.getKey(this));
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index ffa94d23675c6c7b6b005860c99c730aacb94924..c0238ba202b9f6c215788671652c768948acf753 100644
index 650b80b6e38dffa6b6b211cf4ea1125105748935..29756fee1b1c343dbda5a4654b13f5433522cb54 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -752,5 +752,10 @@ public class CraftBlock implements Block {
@@ -753,5 +753,10 @@ public class CraftBlock implements Block {
public com.destroystokyo.paper.block.BlockSoundGroup getSoundGroup() {
return new com.destroystokyo.paper.block.CraftBlockSoundGroup(getNMSBlock().getBlockData().getStepSound());
}

4
Spigot-Server-Patches/0602-Add-Destroy-Speed-API.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Add Destroy Speed API
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 44e1d80ec871142d3b498d3897d8ceb82452c1f2..a1ab9afb9bd2e714d8598013e0e66cc5fcbe371a 100644
index 2a3135c018f0b47a32c5a87698ff12fe521081f0..f0f56b757ca77f7ae445761299c1a4f616c67d55 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -757,5 +757,23 @@ public class CraftBlock implements Block {
@@ -758,5 +758,23 @@ public class CraftBlock implements Block {
public String getTranslationKey() {
return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this);
}

4
Spigot-Server-Patches/0624-Additional-Block-Material-API-s.patch
View File

@ -9,10 +9,10 @@ process to do this in the Bukkit API
Adds API for buildable, replaceable, burnable too.
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index a1ab9afb9bd2e714d8598013e0e66cc5fcbe371a..3372dac5b03ebe518b36a28bb4f64e7b516a2cc9 100644
index f0f56b757ca77f7ae445761299c1a4f616c67d55..13b0a5d44860a997fdad7fdf0e68ce72d1b375af 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -620,6 +620,25 @@ public class CraftBlock implements Block {
@@ -621,6 +621,25 @@ public class CraftBlock implements Block {
return getNMS().getMaterial().isLiquid();
}

6
Spigot-Server-Patches/0636-Added-WorldGameRuleChangeEvent.patch
View File

@ -74,10 +74,10 @@ index 276c28170b2a177dab6b2a0d5425044cd9f8df22..3783f3a83e3e70d77cf0fa1021f62a89
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 01c717d73c142a99545daa5cac81175e0c6dd1c6..e75d321a32a47312b2f087ca41280e68dfd9fe85 100644
index 0d0fd38baea7d0a836c1d605c3392cc5d22c1ca2..d5e406f4db3c8a6dd4d3a543d3dd5e081ee325a2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2369,8 +2369,13 @@ public class CraftWorld implements World {
@@ -2370,8 +2370,13 @@ public class CraftWorld implements World {
if (!isGameRule(rule)) return false;
@ -92,7 +92,7 @@ index 01c717d73c142a99545daa5cac81175e0c6dd1c6..e75d321a32a47312b2f087ca41280e68
handle.onChange(getHandle().getMinecraftServer());
return true;
}
@@ -2405,8 +2410,12 @@ public class CraftWorld implements World {
@@ -2406,8 +2411,12 @@ public class CraftWorld implements World {
if (!isGameRule(rule.getName())) return false;

4
Spigot-Server-Patches/0690-Add-Block-isValidTool.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add Block#isValidTool
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 3372dac5b03ebe518b36a28bb4f64e7b516a2cc9..4b6cfe09c256b43ca59f9c8a52330004c198438b 100644
index 13b0a5d44860a997fdad7fdf0e68ce72d1b375af..eeeaadbd3aa290fc916f0d465f10cad0687b900d 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -794,5 +794,9 @@ public class CraftBlock implements Block {
@@ -795,5 +795,9 @@ public class CraftBlock implements Block {
}
return speed;
}

4
Spigot-Server-Patches/0692-Implement-Keyed-on-World.patch
View File

@ -93,10 +93,10 @@ index cbac3c96c5d3c1551912f5769bfc50d690519495..03b8d67a5f0088c0254b2099f27e8dca
// Check if a World already exists with the UID.
if (getWorld(world.getUID()) != null) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index e75d321a32a47312b2f087ca41280e68dfd9fe85..e739b4f8a7b8785ceb11c553bd27e2fe0e64a4bb 100644
index d5e406f4db3c8a6dd4d3a543d3dd5e081ee325a2..62513d3acb930c4c9fa3d875a1fc94bb4d948951 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2590,6 +2590,11 @@ public class CraftWorld implements World {
@@ -2591,6 +2591,11 @@ public class CraftWorld implements World {
return CompletableFuture.completedFuture(chunk == null ? null : chunk.getBukkitChunk());
}, net.minecraft.server.MinecraftServer.getServer());
}

2
work/Bukkit

@ -1 +1 @@
Subproject commit bb27a6c72318bca9edeee6b62497acb3a1b2391e
Subproject commit b302317a9590f13ee937fa58941048c8b72fd9f8

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit c85efa8767daf863ba854dc451571c46ced9302f
Subproject commit 0e26ddb6a3f17222efa24654432b71f89b341c79