summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-11-06 18:12:31 +1100
committermd_5 <git@md-5.net>2018-11-07 11:15:24 +1100
commitca22de36ab1164f67e5b36c994c62eb0411db056 (patch)
tree379aee0bea10ba73aa12ad6ef144ea463b77e50a
parentde547749ec4c80d540a9992f67a8937fe53359f2 (diff)
downloadcraftbukkit-ca22de36ab1164f67e5b36c994c62eb0411db056.tar
craftbukkit-ca22de36ab1164f67e5b36c994c62eb0411db056.tar.gz
craftbukkit-ca22de36ab1164f67e5b36c994c62eb0411db056.tar.lz
craftbukkit-ca22de36ab1164f67e5b36c994c62eb0411db056.tar.xz
craftbukkit-ca22de36ab1164f67e5b36c994c62eb0411db056.zip
SPIGOT-4469: Age API for EndGateway
-rw-r--r--nms-patches/TileEntityEndGateway.patch8
-rw-r--r--src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java10
2 files changed, 17 insertions, 1 deletions
diff --git a/nms-patches/TileEntityEndGateway.patch b/nms-patches/TileEntityEndGateway.patch
index 585f0f16..5487c6ed 100644
--- a/nms-patches/TileEntityEndGateway.patch
+++ b/nms-patches/TileEntityEndGateway.patch
@@ -1,6 +1,6 @@
--- a/net/minecraft/server/TileEntityEndGateway.java
+++ b/net/minecraft/server/TileEntityEndGateway.java
-@@ -6,6 +6,12 @@
+@@ -6,11 +6,17 @@
import javax.annotation.Nullable;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -13,6 +13,12 @@
public class TileEntityEndGateway extends TileEntityEnderPortal implements ITickable {
+ private static final Logger a = LogManager.getLogger();
+- private long e;
++ public long e; // PAIL
+ private int f;
+ public BlockPosition exitPortal;
+ public boolean exactTeleport;
@@ -113,6 +119,26 @@
if (this.exitPortal != null) {
BlockPosition blockposition = this.exactTeleport ? this.exitPortal : this.i();
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java b/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java
index 8ca614bd..5fbc336b 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftEndGateway.java
@@ -46,6 +46,16 @@ public class CraftEndGateway extends CraftBlockEntityState<TileEntityEndGateway>
}
@Override
+ public long getAge() {
+ return this.getSnapshot().e;
+ }
+
+ @Override
+ public void setAge(long age) {
+ this.getSnapshot().e = age;
+ }
+
+ @Override
public void applyTo(TileEntityEndGateway endGateway) {
super.applyTo(endGateway);