SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13 from AigleDev/1.6.x

Browse Source 
fix an NPE and other changes
This commit is contained in:
Driftay 2019-09-15 16:58:14 -04:00 committed by GitHub
commit 570cb4e805
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java
View File

@ -24,6 +24,8 @@ public class CmdPaypalSee extends FCommand {
return; return;
} }
if (context.args.size() == 0) { if (context.args.size() == 0) {
if (context.fPlayer.getFaction().getPaypal() == null) { if (context.fPlayer.getFaction().getPaypal() == null) {
context.msg(TL.COMMAND_PAYPAL_NOTSET); context.msg(TL.COMMAND_PAYPAL_NOTSET);

1
src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java
View File

@ -259,7 +259,6 @@ public class FactionsBlockListener implements Listener {
@EventHandler @EventHandler
public void onHopperPlace(BlockPlaceEvent e) { public void onHopperPlace(BlockPlaceEvent e) {
if (e.getItemInHand().getType() != Material.HOPPER && !FactionsPlugin.getInstance().getConfig().getBoolean("fvault.No-Hoppers-near-vault")) { if (e.getItemInHand().getType() != Material.HOPPER && !FactionsPlugin.getInstance().getConfig().getBoolean("fvault.No-Hoppers-near-vault")) {
return; return;
} }