Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use UUID instead of name in followtrait

This commit is contained in:
fullwall 2018-10-06 18:31:16 +08:00
parent 787e114faa
commit a3c99e63e7
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -15,6 +15,7 @@ import org.bukkit.DyeColor;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.command.BlockCommandSender;
import org.bukkit.command.CommandSender;
@ -524,8 +525,13 @@ public class NPCCommands {
if (args.argsLength() > 1) {
name = args.getString(1);
}
boolean following = npc.getTrait(FollowTrait.class).toggle(name, protect);
Messaging.sendTr(sender, following ? Messages.FOLLOW_SET : Messages.FOLLOW_UNSET, npc.getName(), name);
OfflinePlayer player = Bukkit.getOfflinePlayer(name);
if (player == null) {
throw new CommandException();
}
boolean following = npc.getTrait(FollowTrait.class).toggle(player, protect);
Messaging.sendTr(sender, following ? Messages.FOLLOW_SET : Messages.FOLLOW_UNSET, npc.getName(),
player.getName());
}
@Command(

21
main/src/main/java/net/citizensnpcs/trait/FollowTrait.java
View File

@ -1,6 +1,9 @@
package net.citizensnpcs.trait;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
@ -14,9 +17,9 @@ public class FollowTrait extends Trait {
@Persist
private boolean active = false;
@Persist
private String followingName;
private UUID followingUUID;
private Player player;
@Persist("protect")
@Persist
private boolean protect;
public FollowTrait() {
@ -37,9 +40,9 @@ public class FollowTrait extends Trait {
@Override
public void run() {
if (player == null || !player.isValid()) {
if (followingName == null)
if (followingUUID == null)
return;
player = Bukkit.getPlayerExact(followingName);
player = Bukkit.getPlayer(followingUUID);
if (player == null) {
return;
}
@ -52,14 +55,14 @@ public class FollowTrait extends Trait {
}
}
public boolean toggle(String name, boolean protect) {
public boolean toggle(OfflinePlayer player, boolean protect) {
this.protect = protect;
if (name.equalsIgnoreCase(this.followingName) || this.followingName == null) {
if (player.getUniqueId().equals(this.followingUUID) || this.followingUUID == null) {
this.active = !active;
}
this.followingName = name;
if (npc.getNavigator().isNavigating() && player != null
&& player == npc.getNavigator().getEntityTarget().getTarget()) {
this.followingUUID = player.getUniqueId();
if (npc.getNavigator().isNavigating() && this.player != null
&& this.player == npc.getNavigator().getEntityTarget().getTarget()) {
npc.getNavigator().cancelNavigation();
}
this.player = null;