mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated Upstream (CraftBukkit)

Browse source 
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 8782be3bb0
commit c36cf2aff4
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/0310-Add-sun-related-API.patch
View file

@ -1,4 +1,4 @@
From ad6bd5036e5ee80145156399673df57eb80ce635 Mon Sep 17 00:00:00 2001 From 385c1916cb44cea61c817fedaed56efda2fc0064 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com> From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 00:54:21 -0500 Date: Sun, 7 Oct 2018 00:54:21 -0500
Subject: [PATCH] Add sun related API Subject: [PATCH] Add sun related API
@ -17,7 +17,7 @@ index eadac07f6..cbaed08f5 100644
if (this.world.J() && !this.world.isClientSide) { if (this.world.J() && !this.world.isClientSide) {
float f = this.aI(); float f = this.aI();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java 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 --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -631,6 +631,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -631,6 +631,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -26,7 +26,7 @@ index 7a9159252..3e4632425 100644
+ public boolean isDayTime() { return J(); } // Paper - OBFHELPER + public boolean isDayTime() { return J(); } // Paper - OBFHELPER
public boolean J() { 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 8a0675037..aec657952 100644 index 8a0675037..aec657952 100644

2
work/CraftBukkit

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