Merge pull request #49 from morganm/master

bug fixes/spout update
Salynne · Nov 7, 2011 · cbfae8a · cbfae8a
2 parents 2270f26 + 3b2a57b
commit cbfae8a
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 13 deletions.
diff --git a/src/main/java/me/olloth/plugins/flight/SpoutFlight.java b/src/main/java/me/olloth/plugins/flight/SpoutFlight.java
@@ -63,9 +63,9 @@ public class SpoutFlight extends JavaPlugin {
 
 	private Config config;
 
-	private Map<String, Boolean> enabled;
-	private Map<String, Double> gravitys;
-	private Map<String, Integer> speeds;
+	final private Map<String, Boolean> enabled = new HashMap<String, Boolean>();
+	final private Map<String, Double> gravitys = new HashMap<String, Double>();
+	final private Map<String, Integer> speeds = new HashMap<String, Integer>();
 
 	public void onDisable() {
 		config.saveMaps();
@@ -76,10 +76,6 @@ public void onEnable() {
 		info = getDescription();
 		pm = getServer().getPluginManager();
 
-		enabled = new HashMap<String, Boolean>();
-		gravitys = new HashMap<String, Double>();
-		speeds = new HashMap<String, Integer>();
-
 		config = new Config(this);
 
 		useOldPerms = false;
@@ -176,10 +172,28 @@ else if (commandName.equals("sfspeed")) {
 	}
 
 	public void setPlayerEnabled(Player player, boolean enable) {
+		if( enabled == null ) {
+			log.severe("SpoutFlight: setPlayerEnabled, enabled map is null");
+			return; 
+		}
+	    if( player == null ) {
+			log.warning("SpoutFlight: setPlayerEnabled, player is null");
+			return;
+	    }
+
 		enabled.put(player.getName(), enable);
 	}
 
 	public boolean getPlayerEnabled(Player player) {
+		if( enabled == null ) {
+			log.severe("SpoutFlight: getPlayerEnabled, enabled map is null");
+			return false; 
+		}
+	    if( player == null ) {
+			log.warning("SpoutFlight: getPlayerEnabled, player is null");
+			return false;
+	    }
+
 		if (!enabled.containsKey(player.getName())) {
 			setPlayerEnabled(player, false);
 		}
@@ -212,15 +226,19 @@ public double getPlayerGravity(Player player) {
 	}
 
 	public void setEnabledMap(Map<String, Boolean> map) {
-		enabled = map;
+		enabled.clear();
+		if( map != null )
+			enabled.putAll(map);
 	}
 
 	public Map<String, Boolean> getEnabledMap() {
 		return enabled;
 	}
 
 	public void setGravityMap(Map<String, Double> map) {
-	    	gravitys = map;
+		gravitys.clear();
+		if( map != null )
+			gravitys.putAll(map);
 	}
 
 	public Map<String, Double> getGravityMap() {

diff --git a/src/main/java/me/olloth/plugins/flight/keys/ToggleKey.java b/src/main/java/me/olloth/plugins/flight/keys/ToggleKey.java
@@ -36,7 +36,7 @@ public void keyReleased(KeyBindingEvent event) {
 			flightPerm = true;
 		}
 
-		else if (event.getScreenType().toString().equals("GAME_SCREEN") && flightPerm) {
+		if (event.getScreenType().toString().equals("GAME_SCREEN") && flightPerm) {
 
 			if (plugin.getPlayerEnabled(player)) {
 				plugin.setPlayerEnabled(player, false);

diff --git a/src/main/java/me/olloth/plugins/flight/keys/UpDownKey.java b/src/main/java/me/olloth/plugins/flight/keys/UpDownKey.java
@@ -19,14 +19,14 @@ public UpDownKey(SpoutFlight plugin, float direction) {
 
 	@Override
 	public void keyPressed(KeyBindingEvent event) {
-		if (event.getScreenType().equals(ScreenType.GAME_SCREEN)) {
+		if (event.getScreenType().equals(ScreenType.GAME_SCREEN) && plugin.getPlayerEnabled(event.getPlayer())) {
 			event.getPlayer().setGravityMultiplier(direction * plugin.getPlayerSpeed(event.getPlayer()));
 		}
 	}
 
 	@Override
 	public void keyReleased(KeyBindingEvent event) {
-		if (event.getScreenType().equals(ScreenType.GAME_SCREEN)) {
+		if (event.getScreenType().equals(ScreenType.GAME_SCREEN) && plugin.getPlayerEnabled(event.getPlayer())) {
 			event.getPlayer().setGravityMultiplier(0);
 			event.getPlayer().setVelocity(new Vector(0, 0, 0));
 		}

diff --git a/src/main/java/me/olloth/plugins/flight/listener/Spouts.java b/src/main/java/me/olloth/plugins/flight/listener/Spouts.java
@@ -31,7 +31,9 @@ public Spouts(SpoutFlight plugin) {
 
 	@Override
 	public void onSpoutCraftEnable(SpoutCraftEnableEvent event) {
-
+		if( event.getPlayer() == null )
+			return;
+
 		if (plugin.getPlayerEnabled(event.getPlayer())) {
 			event.getPlayer().setCanFly(true);
 			event.getPlayer().setGravityMultiplier(0);