Upstream/UltimateKits
1
0
Fork 0
mirror of https://github.com/songoda/UltimateKits.git synced 2024-10-06 17:47:36 +02:00
Code Issues Projects Releases Wiki Activity

null fix

Browse Source
This commit is contained in:
Brianna O'Keefe 2018-11-03 04:24:57 -04:00
parent 7bc52f4dda
commit e66387e3b6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/songoda/ultimatekits/command/commands/CommandRemove.java
View File

@ -24,6 +24,7 @@ public class CommandRemove extends AbstractCommand {
Player player = (Player) sender;
Block block = player.getTargetBlock(null, 200);
Kit kit = instance.getKitManager().removeKitFromLocation(block.getLocation());
if (kit == null) return ReturnType.FAILURE;
UltimateKits.getInstance().getHologramHandler().updateHolograms();
player.sendMessage(Arconix.pl().getApi().format().formatText(UltimateKits.getInstance().getReferences().getPrefix() + "&8Kit &9" + kit.getName() + " &8unassigned from: &a" + block.getType().toString() + "&8."));
return ReturnType.SUCCESS;

6
src/main/java/com/songoda/ultimatekits/kit/KitManager.java
View File

@ -37,7 +37,11 @@ public final class KitManager {
}
public Kit removeKitFromLocation(Location location) {
getKit(roundLocation(location)).reset();
KitBlockData kit = getKit(roundLocation(location));
if (kit == null) return null;
kit.reset();
KitBlockData removed = kitsAtLocations.remove(roundLocation(location));
return (removed != null ? removed.getKit() : null);