core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Auto] Updated Upstream (CraftBukkit) 

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

CraftBukkit Changes:
28d72c4bd SPIGOT-6428: World.generateTree does not generate bee nests
This commit is contained in:
Aikar 2021-04-18 03:52:36 -04:00
parent ca7111d5fe
commit 88ab784da0
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
17 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 fa2e17e925a32294f194e37ba80934a129e1e903..cc78f71c5d8124c0edf3d700af15df025a0bb349 100644
index ccd110c4bfaa263e04154dcc2a5bdbff1f3a7ec2..2513e9a5b66598337f5d380a036ee10fdbab38c3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1842,7 +1842,7 @@ public class CraftWorld implements World {
@@ -1835,7 +1835,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 cc78f71c5d8124c0edf3d700af15df025a0bb349..89858fe2e0258dd93176afcfe39beda2cdc5d432 100644
index 2513e9a5b66598337f5d380a036ee10fdbab38c3..3855b8264d3223f3b1609a3cb81e009b1cd61268 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2359,11 +2359,17 @@ public class CraftWorld implements World {
@@ -2352,11 +2352,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 89858fe2e0258dd93176afcfe39beda2cdc5d432..56ef4cd95ab9d8a21ba45f3170cdc214182966fa 100644
index 3855b8264d3223f3b1609a3cb81e009b1cd61268..f9af209170b5dccf425b2ca35c416ed61ccda3eb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1522,6 +1522,10 @@ public class CraftWorld implements World {
@@ -1515,6 +1515,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/0229-Expand-Explosions-API.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
Add Entity as a Source capability, and add more API choices, and on Location.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index e2dd76d0bc5db5dd07d8574135b8d64b40e2c34a..ad80ebd9d69b4d86078a7c3daa274f115f172794 100644
index f9af209170b5dccf425b2ca35c416ed61ccda3eb..36c9ee703660d0ef558481ef0fea0984502bc14e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -896,6 +896,11 @@ public class CraftWorld implements World {
@@ -889,6 +889,11 @@ public class CraftWorld implements World {
public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks, Entity source) {
return !world.createExplosion(source == null ? null : ((CraftEntity) source).getHandle(), x, y, z, power, setFire, breakBlocks ? Explosion.Effect.BREAK : Explosion.Effect.NONE).wasCanceled;
}

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 0542623a0157e7df9717e3e641e34a6b8527d835..284a554eb3d94c9b0807d6c84aafaa4680d671ea 100644
index 36c9ee703660d0ef558481ef0fea0984502bc14e..945ea6022d89bfb6ee4429233909f8294141fbb6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1311,6 +1311,15 @@ public class CraftWorld implements World {
@@ -1304,6 +1304,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 284a554eb3d94c9b0807d6c84aafaa4680d671ea..d62522e731656e21ed3cc4f7aa4b6de3d84031fc 100644
index 945ea6022d89bfb6ee4429233909f8294141fbb6..716974f9f455a8b35a2bee0ef17e795676f44105 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1047,6 +1047,7 @@ public class CraftWorld implements World {
@@ -1040,6 +1040,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 284a554eb3d94c9b0807d6c84aafaa4680d671ea..d62522e731656e21ed3cc4f7aa4b6de3
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -1066,6 +1067,7 @@ public class CraftWorld implements World {
@@ -1059,6 +1060,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 284a554eb3d94c9b0807d6c84aafaa4680d671ea..d62522e731656e21ed3cc4f7aa4b6de3
Entity bukkitEntity = mcEnt.getBukkitEntity();
// Assuming that bukkitEntity isn't null
@@ -1092,6 +1094,7 @@ public class CraftWorld implements World {
@@ -1085,6 +1087,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 284a554eb3d94c9b0807d6c84aafaa4680d671ea..d62522e731656e21ed3cc4f7aa4b6de3
Entity bukkitEntity = ((net.minecraft.world.entity.Entity) entity).getBukkitEntity();
if (bukkitEntity == null) {
@@ -1115,6 +1118,7 @@ public class CraftWorld implements World {
@@ -1108,6 +1111,7 @@ public class CraftWorld implements World {
for (Object entity: world.entitiesById.values()) {
if (entity instanceof net.minecraft.world.entity.Entity) {

4
Spigot-Server-Patches/0295-Add-sun-related-API.patch
View File

@ -17,10 +17,10 @@ index 41566398f5eee6cf93376f2e2200728bb6d2181c..db72b685f4a4b95f345f1d34f9eeb83b
if (this.world.isDay() && !this.world.isClientSide) {
float f = this.aR();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 806b7559a5230010ebd8cca7808417ee035533f1..317d08c49b980f8785d0d098c993e2ac03200e14 100644
index 796fd718f3fe57618aedc9f5a41aac64422e3e34..2197dad881bf5e9d90902c4526db18e19a087230 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -872,6 +872,13 @@ public class CraftWorld implements World {
@@ -865,6 +865,13 @@ public class CraftWorld implements World {
}
}

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 ef012b51bc4555ab38ad06de694d8f7c946e911a..fc339e1f15b75736af70a02591c7be8b9b39423b 100644
index 206289adb3294b7be15aaf54748c8da7e263bebb..dd9fe7d04666ff6173f9b39e6450bb1165cc9e8a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1979,15 +1979,21 @@ public class CraftWorld implements World {
@@ -1972,15 +1972,21 @@ public class CraftWorld implements World {
@Override
public void setKeepSpawnInMemory(boolean keepLoaded) {

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 2855dbefac9308c043da85d7ddba2fd741a1fbe0..91b8e555f54e60f3839ef3d523bf7d2aef6c253b 100644
index daa5c52a690ce33d2b2cd32c4fbaa147f25dd144..e880ce299bd81ad790da7b94fb28c49a5ebab1e7 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 2855dbefac9308c043da85d7ddba2fd741a1fbe0..91b8e555f54e60f3839ef3d523bf7d2a
// fall through to load
// we do this so we do not re-read the chunk data on disk
@@ -2508,6 +2509,34 @@ public class CraftWorld implements World {
@@ -2501,6 +2502,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 91b8e555f54e60f3839ef3d523bf7d2aef6c253b..630c709c9e5d3e98e1e895ea91f53aea5b9c0eb2 100644
index e880ce299bd81ad790da7b94fb28c49a5ebab1e7..5a7efa46729a233d3aa8b674b1f6a8043b6c5632 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1893,7 +1893,12 @@ public class CraftWorld implements World {
@@ -1886,7 +1886,12 @@ public class CraftWorld implements World {
height = 9;
}

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 9f38e32a602adac2cb4c1fe48c60628e70431c7b..06d5b1f57caed74af6a5db0ad47b01c55a50291e 100644
index a6c1ef15784f7ae7bc703e5bc24cd2c97ad5b1a8..400499f32c59dcb3e850f5b52d84d4564c42c033 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 9f38e32a602adac2cb4c1fe48c60628e70431c7b..06d5b1f57caed74af6a5db0ad47b01c5
import net.minecraft.server.level.Ticket;
import net.minecraft.server.level.TicketType;
import net.minecraft.server.level.WorldServer;
@@ -2557,10 +2558,39 @@ public class CraftWorld implements World {
@@ -2550,10 +2551,39 @@ public class CraftWorld implements World {
// Spigot start
@Override
public int getViewDistance() {

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

@ -1275,10 +1275,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 06d5b1f57caed74af6a5db0ad47b01c55a50291e..ebd648897e309f10091fef2e24e5a6fd07a1c6e9 100644
index 400499f32c59dcb3e850f5b52d84d4564c42c033..2511c44cc62b7cdce17741c786a58f73f4252955 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2548,6 +2548,10 @@ public class CraftWorld implements World {
@@ -2541,6 +2541,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 ebd648897e309f10091fef2e24e5a6fd07a1c6e9..d3a1d5e29d01f5c033e5d8ba0998678eba798032 100644
index 2511c44cc62b7cdce17741c786a58f73f4252955..03761fd7367e184c808f4ef55bdef0838f7427b0 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 ebd648897e309f10091fef2e24e5a6fd07a1c6e9..d3a1d5e29d01f5c033e5d8ba0998678e
world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, true);
return true;
// Paper end
@@ -2554,6 +2571,7 @@ public class CraftWorld implements World {
@@ -2547,6 +2564,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 d3a1d5e29d01f5c033e5d8ba0998678eba798032..67b6dc3199d20921bb83c7e1ddd19cdad46b8c61 100644
index 03761fd7367e184c808f4ef55bdef0838f7427b0..68445b7f32d2cf4c199666a732a36e02459a7b60 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2634,6 +2634,7 @@ public class CraftWorld implements World {
@@ -2627,6 +2627,7 @@ public class CraftWorld implements World {
lightning.teleportAndSync( loc.getX(), loc.getY(), loc.getZ() );
lightning.isEffect = true;
lightning.isSilent = isSilent;

6
Spigot-Server-Patches/0635-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 0d0fd38baea7d0a836c1d605c3392cc5d22c1ca2..d5e406f4db3c8a6dd4d3a543d3dd5e081ee325a2 100644
index ac0fc981c1d6a9e75a062363535630ebf4937840..ef353e21f7e04162d886e70012f845334962459b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2370,8 +2370,13 @@ public class CraftWorld implements World {
@@ -2363,8 +2363,13 @@ public class CraftWorld implements World {
if (!isGameRule(rule)) return false;
@ -92,7 +92,7 @@ index 0d0fd38baea7d0a836c1d605c3392cc5d22c1ca2..d5e406f4db3c8a6dd4d3a543d3dd5e08
handle.onChange(getHandle().getMinecraftServer());
return true;
}
@@ -2406,8 +2411,12 @@ public class CraftWorld implements World {
@@ -2399,8 +2404,12 @@ public class CraftWorld implements World {
if (!isGameRule(rule.getName())) return false;

4
Spigot-Server-Patches/0691-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 d5e406f4db3c8a6dd4d3a543d3dd5e081ee325a2..62513d3acb930c4c9fa3d875a1fc94bb4d948951 100644
index ef353e21f7e04162d886e70012f845334962459b..05098332d83b1abfaa0a6d3bd4a9e801ea90d2ad 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2591,6 +2591,11 @@ public class CraftWorld implements World {
@@ -2584,6 +2584,11 @@ public class CraftWorld implements World {
return CompletableFuture.completedFuture(chunk == null ? null : chunk.getBukkitChunk());
}, net.minecraft.server.MinecraftServer.getServer());
}

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 9294ebbf051ad7340d7e37265568884439973a4a
Subproject commit 28d72c4bd8c22f568384560459d0d703c2d0fefe