testserver/patches/server/0547-More-lightning-API.patch

55 lines
2.1 KiB
Diff
Raw Normal View History

2021-06-11 12:02:28 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: KennyTV <jahnke.nassim@gmail.com>
Date: Sun, 26 Jul 2020 14:44:09 +0200
Subject: [PATCH] More lightning API
diff --git a/src/main/java/net/minecraft/world/entity/LightningBolt.java b/src/main/java/net/minecraft/world/entity/LightningBolt.java
2021-06-14 16:58:00 +00:00
index e476bc8013ac199713e3aaae787bb61fab736aeb..fff23f1cd9da385781547664f26b59255487e2b1 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/entity/LightningBolt.java
+++ b/src/main/java/net/minecraft/world/entity/LightningBolt.java
2021-06-14 16:58:00 +00:00
@@ -39,9 +39,9 @@ public class LightningBolt extends Entity {
private static final int START_LIFE = 2;
private static final double DAMAGE_RADIUS = 3.0D;
private static final double DETECTION_RADIUS = 15.0D;
- private int life;
+ public int life; // Paper - private -> public
2021-06-11 12:02:28 +00:00
public long seed;
- private int flashes;
2021-06-14 16:58:00 +00:00
+ public int flashes; // Paper - private -> public
2021-06-11 12:02:28 +00:00
public boolean visualOnly;
@Nullable
private ServerPlayer cause;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
2021-06-14 16:58:00 +00:00
index f7991ff14ef9cda0327b8621bf615b49cffd7ac5..db6b158f18ad7b9171a8c041802e3495d733bc16 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
@@ -45,4 +45,27 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
2021-06-14 16:58:00 +00:00
return this.spigot;
2021-06-11 12:02:28 +00:00
}
// Spigot end
+
+ // Paper start
+ @Override
+ public int getFlashCount() {
2021-06-14 16:58:00 +00:00
+ return getHandle().flashes;
2021-06-11 12:02:28 +00:00
+ }
+
+ @Override
+ public void setFlashCount(int flashes) {
+ com.google.common.base.Preconditions.checkArgument(flashes >= 0, "Flashes has to be a positive number!");
2021-06-14 16:58:00 +00:00
+ getHandle().flashes = flashes;
2021-06-11 12:02:28 +00:00
+ }
+
+ @Override
+ public int getLifeTicks() {
2021-06-14 16:58:00 +00:00
+ return getHandle().life;
2021-06-11 12:02:28 +00:00
+ }
+
+ @Override
+ public void setLifeTicks(int lifeTicks) {
2021-06-14 16:58:00 +00:00
+ getHandle().life = lifeTicks;
2021-06-11 12:02:28 +00:00
+ }
+ // Paper end
}