From 24d0f4719db407c004714cb28c0923c254d76ec9 Mon Sep 17 00:00:00 2001
From: Sekwah <sekwah41@gmail.com>
Date: Thu, 30 Aug 2018 01:53:17 +0100
Subject: [PATCH] Made fix for #127

---
 build.gradle                                                 | 2 +-
 out/production/resources/config.yml                          | 2 ++
 out/production/resources/plugin.yml                          | 2 +-
 .../java/com/sekwah/advancedportals/compat/CraftBukkit.java  | 5 +++--
 src/main/resources/plugin.yml                                | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 54b78d0..c62334d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'idea'
 apply plugin: 'eclipse'
 
 group = 'com.sekwah.advancedportals'
-version = '0.0.47-snapshot'
+version = '0.0.48-snapshot'
 
 description = ""
 
diff --git a/out/production/resources/config.yml b/out/production/resources/config.yml
index 9d6efbb..aac0b82 100644
--- a/out/production/resources/config.yml
+++ b/out/production/resources/config.yml
@@ -69,6 +69,8 @@ BlockSpectatorMode: false
 PortalCooldown: 5 # How long after trying to enter a portal until the player can try to enter another. 0 or lower to deactivate.
 ThrowbackAmount: 0.7 # How fast to throw them back, 0 or lower to disable throwback
 
+DisableGatewayBeam: true
+
 # Letters are flags. Include them to activate. n always disables everything, remove if you want it to work.
 # Lettering may not make too much sense but meh its useful. Examples are "ocpk" or "cop" (doesnt matter order)
 #
diff --git a/out/production/resources/plugin.yml b/out/production/resources/plugin.yml
index ba36f43..da5e481 100644
--- a/out/production/resources/plugin.yml
+++ b/out/production/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: com.sekwah.advancedportals.AdvancedPortalsPlugin
 name: AdvancedPortals
-version: 0.0.46
+version: 0.0.48
 author: sekwah41
 description: An advanced portals plugin for bukkit.
 api-version: 1.13
diff --git a/src/main/java/com/sekwah/advancedportals/compat/CraftBukkit.java b/src/main/java/com/sekwah/advancedportals/compat/CraftBukkit.java
index 1e5afa2..d0b9040 100644
--- a/src/main/java/com/sekwah/advancedportals/compat/CraftBukkit.java
+++ b/src/main/java/com/sekwah/advancedportals/compat/CraftBukkit.java
@@ -86,6 +86,7 @@ public class CraftBukkit {
                 if(field.getType() == int.class && !field.isAccessible()) {
                     field.setAccessible(true);
                     getEntityTimeoutField = field;
+                    this.plugin.getLogger().info("Got field " +  field.getName() + " from TileEntityEndGateway");
                     return;
                 }
             }
@@ -143,11 +144,11 @@ public class CraftBukkit {
      * @param block
      */
     public void setGatewayAgeHigh(Block block) {
-        if(block.getState().getClass().isAssignableFrom(this.endGatewayClass)) {
+        if(this.endGatewayClass.isAssignableFrom(block.getState().getClass())) {
             try {
                 Object tileEntity = this.getTileEntityMethod.invoke(this.getWorldHandleMethod.invoke(block.getWorld()),
                         this.blockPositionConstructor.newInstance(block.getX(), block.getY(), block.getZ()));
-                if(tileEntity.getClass().isAssignableFrom(this.tileEntityEndGatewayClass)) {
+                if(this.tileEntityEndGatewayClass.isAssignableFrom(tileEntity.getClass())) {
                     getEntityTimeoutField.set(tileEntity, Integer.MAX_VALUE);
                 }
             } catch (IllegalAccessException| InvocationTargetException | InstantiationException e) {
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 7885228..da5e481 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 main: com.sekwah.advancedportals.AdvancedPortalsPlugin
 name: AdvancedPortals
-version: 0.0.47
+version: 0.0.48
 author: sekwah41
 description: An advanced portals plugin for bukkit.
 api-version: 1.13