1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-17 02:34:30 +01:00

[Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
5b289e69 SPIGOT-5778: Added World.getGameTime method

CraftBukkit Changes:
d97d91871 SPIGOT-6347: Nether Portals Default to Nether, even in Nether
8aa6a953f SPIGOT-5778: Added World.getGameTime method

Spigot Changes:
73fb6094 : Add async catching to chunk entity add/remove
This commit is contained in:
Automated 2021-02-12 18:42:12 -05:00
parent 79720eaf85
commit c51e3e6e51
5 changed files with 6 additions and 6 deletions

View file

@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper end
+
/**
* Returns whether the world has an ongoing storm.
* Gets the full in-game time on this world since the world generation
*
diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644

View file

@ -32,8 +32,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Paper end
+
@Override
public boolean createExplosion(double x, double y, double z, float power) {
return createExplosion(x, y, z, power, false, true);
public long getGameTime() {
return world.worldData.getTime();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java

@ -1 +1 @@
Subproject commit 315b69c1d189f057263c5ac54c058352f706a8b9
Subproject commit 5b289e69146fd76766ce7f973821b05792d9a695

@ -1 +1 @@
Subproject commit a82b21297372bff77085d76f1fda58e8b0e2e1ab
Subproject commit d97d91871d7b2003591d9a9d59ee9c2306d3178a

@ -1 +1 @@
Subproject commit cd23533a5b0ce59fcd0dd509be994b94d7c5f55e
Subproject commit 73fb6094f4fa318955bb5bb11a1ec1af12cf90a1