Fix a few edge cases with Bungee gates

DrakiaXYZ · Nov 24, 2012 · d464a16 · d464a16
1 parent ac52066
commit d464a16
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/config.yml b/src/config.yml
@@ -48,4 +48,5 @@ toowner: false
 chargefreedestination: true
 freegatesgreen: false
 debug: false
-permdebug: false
+permdebug: false
+enableBungee: false
diff --git a/src/net/TheDgtl/Stargate/Portal.java b/src/net/TheDgtl/Stargate/Portal.java
@@ -1366,7 +1366,7 @@ public static void loadAllGates(World world) {
 
 					if (!portal.isFixed()) continue;
 
-					if (portal.isBungee()) {
+					if (Stargate.enableBungee && portal.isBungee()) {
 						OpenCount++;
 						portal.open(true);
 						portal.drawSign();

diff --git a/src/net/TheDgtl/Stargate/Stargate.java b/src/net/TheDgtl/Stargate/Stargate.java
@@ -814,6 +814,13 @@ public void onPlayerMove(PlayerMoveEvent event) {
 
 			Stargate.sendMessage(player, Stargate.getString("teleportMsg"), false);
 			if (portal.isBungee()) {
+
+				if (!enableBungee) {
+					player.sendMessage(Stargate.getString("bungeeDisabled"));
+					portal.close(false);
+					return;
+				}
+
 				portal.teleport(player, portal, event);
 
 				// Teleport player via BungeeCord