Update command player lookups, fixes #3
This commit is contained in:
parent
751c2037e4
commit
91e7b1587f
@ -4,6 +4,8 @@ import com.massivecraft.factions.*;
|
||||
import com.massivecraft.factions.integration.Econ;
|
||||
import com.massivecraft.factions.struct.Role;
|
||||
import com.massivecraft.factions.zcore.MCommand;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
@ -203,9 +205,12 @@ public abstract class FCommand extends MCommand<P> {
|
||||
|
||||
// Next we match player names
|
||||
if (faction == null) {
|
||||
FPlayer fplayer = FPlayers.i.getBestIdMatch(name);
|
||||
if (fplayer != null) {
|
||||
faction = fplayer.getFaction();
|
||||
OfflinePlayer player = Bukkit.getOfflinePlayer(name);
|
||||
if (player.getName() != null) {
|
||||
FPlayer fplayer = FPlayers.i.get(player);
|
||||
if (fplayer != null) {
|
||||
faction = fplayer.getFaction();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,7 @@
|
||||
package com.massivecraft.factions.zcore.persist;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.OfflinePlayer;
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.Gson;
|
||||
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);
|
||||
}
|
||||
|
||||
public E get(Player player) {
|
||||
public E get(OfflinePlayer player) {
|
||||
return this.get(player.getUniqueId().toString());
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user