geforkt von Mirrors/Paper
c0936a71bd
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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
90 Zeilen
3.9 KiB
Diff
90 Zeilen
3.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MiniDigger <admin@benndorf.dev>
|
|
Date: Wed, 29 Apr 2020 02:09:17 +0200
|
|
Subject: [PATCH] Allow delegation to vanilla chunk gen
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index b21d1e8a53e4c51fa7742ee6211b4aedcd460a95..be9fbad7a60f58ef2d087cf5106f40d214b60175 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1970,6 +1970,24 @@ public final class Bukkit {
|
|
return server.createChunkData(world);
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world
|
|
+ *
|
|
+ * @param world the world to create the ChunkData for
|
|
+ * @param x the x coordinate of the chunk
|
|
+ * @param z the z coordinate of the chunk
|
|
+ * @return a new ChunkData for the world
|
|
+ * @deprecated The new multi-stage worldgen API allows a similar effect by overriding all of the "shouldGenerate..." methods to
|
|
+ * return true, and then modifying the chunkdata in a later stage such as surface or bedrock generation.
|
|
+ */
|
|
+ @NotNull
|
|
+ @Deprecated(forRemoval = true)
|
|
+ public static ChunkGenerator.ChunkData createVanillaChunkData(@NotNull World world, int x, int z) {
|
|
+ return server.createVanillaChunkData(world, x, z);
|
|
+ }
|
|
+ // Paper stop
|
|
+
|
|
/**
|
|
* Creates a boss bar instance to display to players. The progress
|
|
* defaults to 1.0
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 92db34d3ff29a84b29701de6b64a70413a440ce9..1e000b6ed16a2ea550094a1cbb432eb625899a9a 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1661,6 +1661,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
|
|
@NotNull
|
|
public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world.
|
|
+ *
|
|
+ * @param world the world to create the ChunkData for
|
|
+ * @param x the x coordinate of the chunk
|
|
+ * @param z the z coordinate of the chunk
|
|
+ * @return a new ChunkData for the world
|
|
+ * @deprecated The new multi-stage worldgen API allows a similar effect by overriding all of the "shouldGenerate..." methods to
|
|
+ * return true, and then modifying the chunkdata in a later stage such as surface or bedrock generation.
|
|
+ */
|
|
+ @NotNull
|
|
+ @Deprecated(forRemoval = true)
|
|
+ ChunkGenerator.ChunkData createVanillaChunkData(@NotNull World world, int x, int z);
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Creates a boss bar instance to display to players. The progress
|
|
* defaults to 1.0
|
|
diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
|
|
index 7e7a53b41013f1bf8956c0e278820f18d77b2f0d..c942b7101a38ac7dc70e11e87afa1f9210000bc1 100644
|
|
--- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
|
|
+++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
|
|
@@ -577,6 +577,22 @@ public abstract class ChunkGenerator {
|
|
return false;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world
|
|
+ *
|
|
+ * @param world the world to create the ChunkData for
|
|
+ * @param x the x coordinate of the chunk
|
|
+ * @param z the z coordinate of the chunk
|
|
+ * @return a new ChunkData for the world
|
|
+ *
|
|
+ */
|
|
+ @NotNull
|
|
+ public ChunkData createVanillaChunkData(@NotNull World world, int x, int z) {
|
|
+ return Bukkit.getServer().createVanillaChunkData(world, x, z);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Gets if the server should generate Vanilla structures after this
|
|
* ChunkGenerator.
|