Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug in choosing the plugin name for MassiveCommand and add contains entity to WorldExceptionSet.

Browse Source
This commit is contained in:
Olof Larsson 2015-03-25 19:22:51 +01:00
parent ce7a9a2226
commit 17e053b0b1
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/massivecraft/massivecore/MassiveCoreEngineCommandRegistration.java
View File

@ -109,8 +109,8 @@ public class MassiveCoreEngineCommandRegistration extends EngineAbstract
MassiveCoreBukkitCommand command = new MassiveCoreBukkitCommand(name, target); MassiveCoreBukkitCommand command = new MassiveCoreBukkitCommand(name, target);
// ... and finally register it. // ... and finally register it.
Plugin plugin = massiveCurrent.getRegisteredPlugin(); Plugin plugin = command.getPlugin();
String pluginName = plugin != null ? plugin.getName() : "MassiveCore"; String pluginName = (plugin != null ? plugin.getName() : "MassiveCore");
simpleCommandMap.register(pluginName, command); simpleCommandMap.register(pluginName, command);
} }

6
src/com/massivecraft/massivecore/collections/WorldExceptionSet.java
View File

@ -1,6 +1,7 @@
package com.massivecraft.massivecore.collections; package com.massivecraft.massivecore.collections;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Entity;
import com.massivecraft.massivecore.CaseInsensitiveComparator; import com.massivecraft.massivecore.CaseInsensitiveComparator;
@ -28,5 +29,10 @@ public class WorldExceptionSet
{ {
return this.contains(world.getName()); return this.contains(world.getName());
} }
public boolean contains(Entity entity)
{
return this.contains(entity.getWorld());
}
} }