From ab9ea25bfd5c2c0544d9d6a60f50e4b4209dd637 Mon Sep 17 00:00:00 2001
From: Magnus Ulf <magnus@puj.dk>
Date: Thu, 7 May 2015 22:13:48 +0200
Subject: [PATCH] BugFix

---
 src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java | 3 ++-
 src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java   | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java b/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java
index 7b9bb731..8356c578 100644
--- a/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java
+++ b/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java
@@ -1,6 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import com.massivecraft.factions.Perm;
@@ -42,7 +43,7 @@ public class CmdFactionsPermShow extends FactionsCommand
 	{
 		// Arg: Faction
 		Faction faction = this.readArg(msenderFaction);
-		List<MPerm> mperms = this.readArg(MPerm.getAll());
+		Collection<MPerm> mperms = this.readArg(MPerm.getAll());
 
 		// Create messages
 		List<String> messages = new ArrayList<String>();
diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java
index 8d09a35d..df5c35ee 100644
--- a/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java
+++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java
@@ -56,7 +56,6 @@ public class CmdFactionsSetAll extends CmdFactionsSetXAll
 		
 		// Args
 		Faction oldFaction = this.getOldFaction();
-		if (oldFaction == null) return null;
 		
 		if (LIST_ALL.contains(this.argAt(0).toLowerCase()))
 		{