2019-12-16 02:58:10 +00:00
|
|
|
From 7fb5d1f255437c8bdee1549abcac6cbafc4b3b59 Mon Sep 17 00:00:00 2001
|
2018-10-12 01:42:49 +00:00
|
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
|
|
Date: Sun, 7 Oct 2018 00:54:21 -0500
|
|
|
|
Subject: [PATCH] Add sun related API
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
|
2019-12-16 02:58:10 +00:00
|
|
|
index eadac07f69..cbaed08f52 100644
|
2018-10-12 01:42:49 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
|
2019-12-12 16:20:43 +00:00
|
|
|
@@ -1334,6 +1334,7 @@ public abstract class EntityInsentient extends EntityLiving {
|
2018-10-12 01:42:49 +00:00
|
|
|
return flag;
|
|
|
|
}
|
|
|
|
|
2019-12-12 16:20:43 +00:00
|
|
|
+ public boolean isInDaylight() { return this.en(); } // Paper - OBFHELPER
|
|
|
|
protected boolean en() {
|
2019-05-05 08:33:44 +00:00
|
|
|
if (this.world.J() && !this.world.isClientSide) {
|
2019-12-12 16:20:43 +00:00
|
|
|
float f = this.aI();
|
2018-10-12 01:42:49 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
2019-12-16 02:58:10 +00:00
|
|
|
index 39e85f80ca..75c539d72d 100644
|
2018-10-12 01:42:49 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2019-12-16 02:58:10 +00:00
|
|
|
@@ -636,6 +636,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
|
2018-10-12 01:42:49 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-05-05 08:33:44 +00:00
|
|
|
+ public boolean isDayTime() { return J(); } // Paper - OBFHELPER
|
|
|
|
public boolean J() {
|
2019-12-15 19:40:28 +00:00
|
|
|
return this.worldProvider.getDimensionManager().getType() == DimensionManager.OVERWORLD && this.c < 4; // CraftBukkit
|
2018-10-12 01:42:49 +00:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2019-12-16 02:58:10 +00:00
|
|
|
index 8a0675037a..aec657952c 100644
|
2018-10-12 01:42:49 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2019-12-12 16:20:43 +00:00
|
|
|
@@ -855,6 +855,13 @@ public class CraftWorld implements World {
|
2018-10-12 01:42:49 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
2019-05-06 02:58:04 +00:00
|
|
|
+ @Override
|
2018-10-12 01:42:49 +00:00
|
|
|
+ public boolean isDayTime() {
|
|
|
|
+ return getHandle().isDayTime();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
2019-05-06 02:58:04 +00:00
|
|
|
@Override
|
2018-10-12 01:42:49 +00:00
|
|
|
public boolean createExplosion(double x, double y, double z, float power) {
|
|
|
|
return createExplosion(x, y, z, power, false, true);
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
2019-12-16 02:58:10 +00:00
|
|
|
index 53c2d154ed..56c233872b 100644
|
2018-10-12 01:42:49 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
|
2019-05-06 02:58:04 +00:00
|
|
|
@@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
|
2018-10-12 01:42:49 +00:00
|
|
|
public long getSeed() {
|
|
|
|
return getHandle().lootTableSeed;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
2019-05-06 02:58:04 +00:00
|
|
|
+ @Override
|
2018-10-12 01:42:49 +00:00
|
|
|
+ public boolean isInDaylight() {
|
|
|
|
+ return getHandle().isInDaylight();
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
--
|
2019-12-13 20:41:01 +00:00
|
|
|
2.24.1
|
2018-10-12 01:42:49 +00:00
|
|
|
|