Updated Upstream (CraftBukkit)

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

CraftBukkit Changes:
e43416a3 SPIGOT-5455: Mobs do not ignite due to sun in extra worlds
This commit is contained in:
Shane Freeder 2019-12-15 19:40:28 +00:00
parent 951d879aef
commit fa3c3913d9
2 changed files with 3 additions and 3 deletions

View File

@ -17,7 +17,7 @@ index eadac07f6..cbaed08f5 100644
if (this.world.J() && !this.world.isClientSide) {
float f = this.aI();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7a9159252..3e4632425 100644
index 5e6a4e20b..08b6ae252 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -26,7 +26,7 @@ index 7a9159252..3e4632425 100644
+ public boolean isDayTime() { return J(); } // Paper - OBFHELPER
public boolean J() {
return this.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD && this.c < 4;
return this.worldProvider.getDimensionManager().getType() == DimensionManager.OVERWORLD && this.c < 4; // CraftBukkit
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8a0675037..aec657952 100644

@ -1 +1 @@
Subproject commit 61d4b0902319ca7fceb0a85a1d574ad47cc9239c
Subproject commit e43416a342cbb52a9b524e504c4bb7edfe317db0