TakeV
/
Paper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Auto] Updated Upstream (Bukkit/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

Bukkit Changes:
15ba9ae7 SPIGOT-6357: Add World#getMinHeight

CraftBukkit Changes:
e9ad7cba9 SPIGOT-6357: Add World#getMinHeight
This commit is contained in:
Aikar 2021-03-28 04:42:30 -04:00
parent 8b47131da7
commit f7b4abb259
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
13 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,10 +515,10 @@ index b32de827cf8d1780861c271b4215276fdaab7165..1020002ff7127877db2d7e096f2c5217
* Options which can be applied to redstone dust particles - a particle
* color and size.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index cae848ce698337d0b254bd48938abfc1e68ad561..05643d0f2bf2cb2dedb0a2ad693b2121565d3f1f 100644
index 27bbddac946879149ec43d428417c4707f6a9a8c..fe125ae7bbd7c9dde9db7838169e4819416e148d 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2583,7 +2583,57 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
@@ -2592,7 +2592,57 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
*/

4
Spigot-API-Patches/0201-World-view-distance-api.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] World view distance api
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index daa8e7a3eacfe4583166313727ac550c9775ebb8..476184db904d8a2e1347e1219e8ba196bf4da5cb 100644
index 7bf85151efddcbd561afb0fb2d423aa97ac176c1..61dfb057d94d89477d11b9e8d4be7c16032e25a9 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3438,6 +3438,34 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
@@ -3447,6 +3447,34 @@ public interface World extends PluginMessageRecipient, Metadatable, net.kyori.ad
int getViewDistance();
// Spigot end

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

@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
This adds a new Builder API which is much friendlier to use.
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 1e9884e819ac2afe58b5f50b89355c2d58ed73d5..3876958f20e675c4c8fd505c5fb333ccb9cdc8c9 100644
index e27bcf54654c1aabb3baf8c549ceac584f528b6c..32ad210daf61b6c43fc60f3140dc46529d14ec27 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -170,7 +170,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -43,10 +43,10 @@ index 1e9884e819ac2afe58b5f50b89355c2d58ed73d5..3876958f20e675c4c8fd505c5fb333cc
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 4e255f2ca75ac0c1e1572f312a669cb6d3b60121..dfc3a2f6221c9e172d0d40510cb5edfc23649e53 100644
index 671589aa0aeec98134d3ef0676193db1ec6f6015..a90d59990bb86739b201a88e5623d1c2ddcee1be 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2353,11 +2353,17 @@ public class CraftWorld implements World {
@@ -2358,11 +2358,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/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 02b7be844f723fd0e0d5f547ba8ff31a14f448a7..9e47e9cfa5bf1819e6d6779c52828e4472e4eed0 100644
index d17d77dd9e059bafc3b59ac12f601f9d54226829..c19ac8c28a799bebf68f098171cefd0fc3ec3f0b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1973,15 +1973,21 @@ public class CraftWorld implements World {
@@ -1978,15 +1978,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 bf1ebb108149f519ae29a2277020398c898d2bc3..7169cb3eb857a0725822bb7561693453f1600cdc 100644
index 57e8b8078aaa92d0869ab2aeb17a5f53c5e7b2bb..ca341a45eff7bf6c57d45a9b460a208f16925b7b 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 bf1ebb108149f519ae29a2277020398c898d2bc3..7169cb3eb857a0725822bb7561693453
// fall through to load
// we do this so we do not re-read the chunk data on disk
@@ -2502,6 +2503,34 @@ public class CraftWorld implements World {
@@ -2507,6 +2508,34 @@ public class CraftWorld implements World {
public DragonBattle getEnderDragonBattle() {
return (getHandle().getDragonBattle() == null) ? null : new CraftDragonBattle(getHandle().getDragonBattle());
}

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 adcb2bd279f1f87d174556cb1b8aac497c11d7d3..72619407f22584f9677dbea759684cfa67f7648c 100644
index 58e1ff5be8408e093f7ac5ea2712f4d1c92e6a76..37d9a17f4161c59459742fd60d1d347cdc6a169c 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 adcb2bd279f1f87d174556cb1b8aac497c11d7d3..72619407f22584f9677dbea759684cfa
import net.minecraft.server.level.Ticket;
import net.minecraft.server.level.TicketType;
import net.minecraft.server.level.WorldServer;
@@ -2551,10 +2552,39 @@ public class CraftWorld implements World {
@@ -2556,10 +2557,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

@ -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 72619407f22584f9677dbea759684cfa67f7648c..e463dd48593becd701d8e087b8a058b8a4a50ee5 100644
index 37d9a17f4161c59459742fd60d1d347cdc6a169c..aa78cbbf909e366a9a23902711453a9b2e1a32c7 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2542,6 +2542,10 @@ public class CraftWorld implements World {
@@ -2547,6 +2547,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 e463dd48593becd701d8e087b8a058b8a4a50ee5..c538e075904382de72a74f518223c6b9daaf0625 100644
index aa78cbbf909e366a9a23902711453a9b2e1a32c7..611f53f52b4f2d831920df40d48b8bbc61326f1b 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 e463dd48593becd701d8e087b8a058b8a4a50ee5..c538e075904382de72a74f518223c6b9
world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, true);
return true;
// Paper end
@@ -2548,6 +2565,7 @@ public class CraftWorld implements World {
@@ -2553,6 +2570,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 c538e075904382de72a74f518223c6b9daaf0625..54625156dd21607f27eb97f95dead60b806f19e1 100644
index 611f53f52b4f2d831920df40d48b8bbc61326f1b..4a5027d6fbd6c68d0e3b43f74afdd49ffa22188c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2628,6 +2628,7 @@ public class CraftWorld implements World {
@@ -2633,6 +2633,7 @@ public class CraftWorld implements World {
lightning.teleportAndSync( loc.getX(), loc.getY(), loc.getZ() );
lightning.isEffect = true;
lightning.isSilent = isSilent;

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 50b6829394af843350d70604d9151453e4c8bbef..2008e05c090e6a390d4210f2e8ed6ff75fb99e89 100644
index 01c717d73c142a99545daa5cac81175e0c6dd1c6..e75d321a32a47312b2f087ca41280e68dfd9fe85 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2364,8 +2364,13 @@ public class CraftWorld implements World {
@@ -2369,8 +2369,13 @@ public class CraftWorld implements World {
if (!isGameRule(rule)) return false;
@ -92,7 +92,7 @@ index 50b6829394af843350d70604d9151453e4c8bbef..2008e05c090e6a390d4210f2e8ed6ff7
handle.onChange(getHandle().getMinecraftServer());
return true;
}
@@ -2400,8 +2405,12 @@ public class CraftWorld implements World {
@@ -2405,8 +2410,12 @@ public class CraftWorld implements World {
if (!isGameRule(rule.getName())) return false;

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 2008e05c090e6a390d4210f2e8ed6ff75fb99e89..16567619d7ca84a997ef46417d72f92e6db6993d 100644
index e75d321a32a47312b2f087ca41280e68dfd9fe85..e739b4f8a7b8785ceb11c553bd27e2fe0e64a4bb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2585,6 +2585,11 @@ public class CraftWorld implements World {
@@ -2590,6 +2590,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 4e5f46cb2741c3f898de399e2a936b8b254ba211
Subproject commit 15ba9ae78ad9048f810de887431dfc6d0c2bdf50

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 7eb35643e2ed2fb55732e2ef9e43087f91006fef
Subproject commit e9ad7cba9b8b291e2c9c0f0c02f783e63553570e