Upstream
/
Multiverse-Core
mirror of https://github.com/Multiverse/Multiverse-Core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix NPE with players and purging, Update AP and CH

This commit is contained in:
Eric Stokes 2012-03-10 00:32:26 -07:00
parent d84f930a54
commit 7da91f7875
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -207,7 +207,7 @@
<dependency> <dependency>
<groupId>com.fernferret.allpay</groupId> <groupId>com.fernferret.allpay</groupId>
<artifactId>AllPay</artifactId> <artifactId>AllPay</artifactId>
<version>8</version> <version>9</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
@ -216,7 +216,7 @@
<dependency> <dependency>
<groupId>com.pneumaticraft.commandhandler</groupId> <groupId>com.pneumaticraft.commandhandler</groupId>
<artifactId>CommandHandler</artifactId> <artifactId>CommandHandler</artifactId>
<version>6</version> <version>7</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>

1
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
View File

@ -45,6 +45,7 @@ import org.bukkit.configuration.Configuration;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;

2
src/main/java/com/onarandombox/MultiverseCore/utils/SimpleWorldPurger.java
View File

@ -106,7 +106,7 @@ public class SimpleWorldPurger implements WorldPurger {
negate = negateMonsters; negate = negateMonsters;
} }
for (String s : thingsToKill) { for (String s : thingsToKill) {
if (e.getType().getName().equalsIgnoreCase(s)) { if (e.getType().getName() != null && e.getType().getName().equalsIgnoreCase(s)) {
specified = true; specified = true;
if (!negate) { if (!negate) {
this.plugin.log(Level.FINEST, "Removing an entity because it WAS specified and we are NOT negating: " + e); this.plugin.log(Level.FINEST, "Removing an entity because it WAS specified and we are NOT negating: " + e);