Merge branch '2.8.3' into master

rmct · Oct 4, 2016 · d400147 · d400147
2 parents 21e807d + ba5c450
commit d400147
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
 
   <groupId>org.mctourney.autoreferee</groupId>
   <artifactId>AutoReferee</artifactId>
-  <version>2.8.2</version>
+  <version>2.8.3</version>
   <name>AutoReferee Core Plugin</name>
   <url>https://www.reddit.com/r/mctourney</url>
   <description>Bukkit plugin for automatically refereeing competitive Minecraft matches.</description>
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2</version>
+      <version>3.2.2</version>
     </dependency>
 
     <dependency>

diff --git a/src/main/java/org/mctourney/autoreferee/AutoRefMatch.java b/src/main/java/org/mctourney/autoreferee/AutoRefMatch.java
@@ -204,6 +204,14 @@ public boolean isPracticeMode()
 		return existingteams < 2;
 	}
 
+	public boolean willBePracticeMode()
+	{
+		int existingteams = 0;
+		for (AutoRefTeam team : this.getTeams())
+			if (!team.isEmptyTeam()) ++existingteams;
+		return existingteams < 2;
+	}
+
 	protected boolean previewMode = false;
 
 	public void setPreviewMode(boolean b)

diff --git a/src/main/java/org/mctourney/autoreferee/AutoRefPlayer.java b/src/main/java/org/mctourney/autoreferee/AutoRefPlayer.java
@@ -718,8 +718,12 @@ public void registerDeath(PlayerDeathEvent e, Location from)
 	{
 		// sanity check...
 		if (e.getEntity() != getPlayer()) return;
+		try{
 		this.saveInventoryView();
-
+		} catch (IllegalArgumentException ex){
+			//Print a stack trace if inventory sizes change in future updates. 
+			ex.printStackTrace();
+		}
 		// if this player has a number of lives, reduce by one
 		if (hasLives()) --livesRemaining;
 
@@ -956,9 +960,15 @@ public Inventory getInventoryView(String name)
 
 		PlayerInventory pInventory = player.getInventory();
 		String inventoryName = name.length() > 32 ? name.substring(0, 32) : name;
+
+		// Player inventory grew by a slot in 1.9
+		// This code ensures that no matter how many slots we have, we're always a multiple of 9
+		int displayInventorySize = pInventory.getSize() + 9 + (9 - (pInventory.getSize() % 9));
 		Inventory inventoryView = Bukkit.getServer().createInventory(null,
-			pInventory.getSize() + 9, inventoryName);
-
+				displayInventorySize, inventoryName);	
+
+
+
 		ItemStack[] oldContents = pInventory.getContents();
 		ItemStack[] newContents = inventoryView.getContents();
 

diff --git a/src/main/java/org/mctourney/autoreferee/commands/PlayerCommands.java b/src/main/java/org/mctourney/autoreferee/commands/PlayerCommands.java
@@ -250,17 +250,22 @@ public boolean ready(CommandSender sender, AutoRefMatch match, String[] args, Co
 			match.cancelCountdown();
 		}
 
-		// if console or referee sends this message
-		if (sender instanceof ConsoleCommandSender || match.isReferee(player))
-		{
-			// attempt to set the ready delay if one is specified
-			try { if (options.hasOption('s')) match.setReadyDelay(Integer.parseInt(options.getOptionValue('s'))); }
-			catch (NumberFormatException e) {  };
+		// Reset the ready delay.
+		match.setReadyDelay(-1);
+
+		// If a ready delay is specified (-s), and the delay is authorized (practise mode or ref), then set the delay.
+		if (options.hasOption('s')
+				&& (match.willBePracticeMode() || sender instanceof ConsoleCommandSender || match.isReferee(player))) {
+			try {
+				match.setReadyDelay(Integer.parseInt(options.getOptionValue('s')));
+			} catch (NumberFormatException e) { }
+		}
 
+		// if console or referee sends this message
+		if (sender instanceof ConsoleCommandSender || match.isReferee(player)) {
 			match.setRefereeReady(rstate);
 		}
-		else
-		{
+		else {
 			AutoRefTeam team = match.getPlayerTeam(player);
 			if (team != null) team.setReady(rstate);
 		}

diff --git a/src/main/java/org/mctourney/autoreferee/listeners/lobby/LobbyListener.java b/src/main/java/org/mctourney/autoreferee/listeners/lobby/LobbyListener.java
@@ -168,11 +168,14 @@ public void creatureSpawn(CreatureSpawnEvent event)
 	@EventHandler(priority= EventPriority.HIGHEST)
 	public void projectileLaunch(ProjectileLaunchEvent event)
 	{
-		LivingEntity shooter = (LivingEntity) event.getEntity().getShooter();
-		if (shooter != null && checkAdminPrivilege(shooter)) return;
-
+		//Some nonliving entities can shoot
+		if (event.getEntity().getShooter() instanceof LivingEntity){		
+			LivingEntity shooter = (LivingEntity) event.getEntity().getShooter();
+			if (shooter != null && checkAdminPrivilege(shooter)) return;
+		}
 		if (event.getEntity().getWorld() == plugin.getLobbyWorld())
 			event.setCancelled(true);
+
 	}
 
 	@EventHandler(priority=EventPriority.HIGHEST)

diff --git a/src/main/java/org/mctourney/autoreferee/util/ArmorPoints.java b/src/main/java/org/mctourney/autoreferee/util/ArmorPoints.java
@@ -53,7 +53,9 @@ public static int fromPlayerInventory(PlayerInventory inv)
 	{
 		int armorPoints = 0;
 		for (ItemStack item : inv.getArmorContents())
+			if (item != null){
 			armorPoints += ArmorPoints.fromItemStack(item);
+			}
 		return armorPoints;
 	}
 

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: AutoReferee
 main: org.mctourney.autoreferee.AutoReferee
-version: 2.8.2
+version: 2.8.3
 author: "authorblues, net"
 load: startup