Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears 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: ff0672ca SPIGOT-5211: Add Raid API CraftBukkit Changes: 96bc85f0 SPIGOT-5298: Remove unexplained 0.1 drop chance offset 6ed8a189 SPIGOT-5290: Invulnerable and/or Marker armor stand triggers EntityDamageEvent 631eaeb0 SPIGOT-5297: PlayerBedLeaveEvent.getBed() returns player location 8d4bc541 SPIGOT-5293: Sponge behaviour differs from Vanilla e91fd75e SPIGOT-5291: Missing event for ravagers trampling crops cbdd7139 SPIGOT-5211: Add Raid API edd8fdfb SPIGOT-5287: Fix rare CME generating new chunks 3fc97f08 SPIGOT-5265: FireworkExplodeEvent only fired when rockets explode in air Spigot Changes: 065a3734 Rebuild patches a5961826 SPIGOT-5286: tick-inactive-villagers invokes the AI for NoAI villagers
This commit is contained in:
@@ -3638,7 +3638,7 @@ index 316959064..0e98b7803 100644
|
||||
|
||||
HAS_SPACE(VillagePlaceRecord::d), IS_OCCUPIED(VillagePlaceRecord::e), ANY((villageplacerecord) -> {
|
||||
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
index 4497f6a60..cf981632c 100644
|
||||
index f1ad7be75..0c1f4e6e1 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -0,0 +0,0 @@ public class WorldServer extends World {
|
||||
@@ -3731,7 +3731,7 @@ index 4497f6a60..cf981632c 100644
|
||||
|
||||
public void doTick(BooleanSupplier booleansupplier) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index 20e9fd8a7..0e98f0022 100644
|
||||
index 088f0800f..5e552029a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -0,0 +0,0 @@ public class CraftWorld implements World {
|
||||
@@ -3767,7 +3767,7 @@ index 20e9fd8a7..0e98f0022 100644
|
||||
// fall through to load
|
||||
// we do this so we do not re-read the chunk data on disk
|
||||
@@ -0,0 +0,0 @@ public class CraftWorld implements World {
|
||||
return (nearest == null) ? null : new Location(this, nearest.getX(), nearest.getY(), nearest.getZ());
|
||||
return persistentRaid.a.values().stream().map(CraftRaid::new).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
+ // Paper start
|
||||
|
||||
Reference in New Issue
Block a user