From 202c7f3d55368ab1ff9389532aa6bcee95abcd39 Mon Sep 17 00:00:00 2001 From: Steven Scott Date: Sun, 3 Mar 2013 21:19:04 -0800 Subject: [PATCH] Move the Bungee check to after gate layout check --- README | 2 ++ src/net/TheDgtl/Stargate/Portal.java | 29 ++++++++++++++-------------- src/plugin.yml | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/README b/README index c562159..72b49b4 100644 --- a/README +++ b/README @@ -215,6 +215,8 @@ Bukkit Issue: Stargate will randomly NPE when drawing a sign. Long-standing Bukk ============= Changes ============= +[Version 0.7.9.7] + - Do the Bungee check after the gate layout check. [Version 0.7.9.6] - Actually remove the player from the BungeeQueue when they connect. Oops :) - Implement stargate.server nodes diff --git a/src/net/TheDgtl/Stargate/Portal.java b/src/net/TheDgtl/Stargate/Portal.java index 95d91ef..42e32f5 100644 --- a/src/net/TheDgtl/Stargate/Portal.java +++ b/src/net/TheDgtl/Stargate/Portal.java @@ -923,20 +923,6 @@ public class Portal { if (noNetwork && !Stargate.canOption(player, "nonetwork")) noNetwork = false; if (random && !Stargate.canOption(player, "random")) random = false; - // If the player is trying to create a Bungee gate without permissions, drop out here - if (bungee) { - if (!Stargate.enableBungee) { - Stargate.sendMessage(player, Stargate.getString("bungeeDisabled")); - return null; - } else if (!Stargate.hasPerm(player, "stargate.admin.bungee")) { - Stargate.sendMessage(player, Stargate.getString("bungeeDeny")); - return null; - } else if (destName.isEmpty() || network.isEmpty()) { - Stargate.sendMessage(player, Stargate.getString("bungeeEmpty")); - return null; - } - } - // Can not create a non-fixed always-on gate. if (alwaysOn && destName.length() == 0) { alwaysOn = false; @@ -1018,6 +1004,21 @@ public class Portal { return null; } + // If the player is trying to create a Bungee gate without permissions, drop out here + // Do this after the gate layout check, in the least + if (bungee) { + if (!Stargate.enableBungee) { + Stargate.sendMessage(player, Stargate.getString("bungeeDisabled")); + return null; + } else if (!Stargate.hasPerm(player, "stargate.admin.bungee")) { + Stargate.sendMessage(player, Stargate.getString("bungeeDeny")); + return null; + } else if (destName.isEmpty() || network.isEmpty()) { + Stargate.sendMessage(player, Stargate.getString("bungeeEmpty")); + return null; + } + } + // Debug Stargate.debug("createPortal", "h = " + hidden + " a = " + alwaysOn + " p = " + priv + " f = " + free + " b = " + backwards + " s = " + show + " n = " + noNetwork + " r = " + random + " u = " + bungee); diff --git a/src/plugin.yml b/src/plugin.yml index 9a7f756..857ee71 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: Stargate main: net.TheDgtl.Stargate.Stargate -version: 0.7.9.6 +version: 0.7.9.7 description: Stargate mod for Bukkit author: Drakia website: http://www.thedgtl.net