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

Update command player lookups, fixes #3

Browse Source
This commit is contained in:
gravitylow 2014-04-16 18:35:36 -04:00
parent 751c2037e4
commit 91e7b1587f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/massivecraft/factions/cmd/FCommand.java
View File

@ -4,6 +4,8 @@ import com.massivecraft.factions.*;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
import com.massivecraft.factions.struct.Role; import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.MCommand; import com.massivecraft.factions.zcore.MCommand;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -203,11 +205,14 @@ public abstract class FCommand extends MCommand<P> {
// Next we match player names // Next we match player names
if (faction == null) { if (faction == null) {
FPlayer fplayer = FPlayers.i.getBestIdMatch(name); OfflinePlayer player = Bukkit.getOfflinePlayer(name);
if (player.getName() != null) {
FPlayer fplayer = FPlayers.i.get(player);
if (fplayer != null) { if (fplayer != null) {
faction = fplayer.getFaction(); faction = fplayer.getFaction();
} }
} }
}
if (faction != null) { if (faction != null) {
ret = faction; ret = faction;

3
src/main/java/com/massivecraft/factions/zcore/persist/PlayerEntityCollection.java
View File

@ -1,6 +1,7 @@
package com.massivecraft.factions.zcore.persist; package com.massivecraft.factions.zcore.persist;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.craftbukkit.libs.com.google.gson.Gson; import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -24,7 +25,7 @@ public abstract class PlayerEntityCollection<E extends Entity> extends EntityCol
super(entityClass, entities, id2entity, file, gson, true); super(entityClass, entities, id2entity, file, gson, true);
} }
public E get(Player player) { public E get(OfflinePlayer player) {
return this.get(player.getUniqueId().toString()); return this.get(player.getUniqueId().toString());
} }