Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-21 11:45:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility issues with Citizens (fixes #3105)

Browse Source
This commit is contained in:
SirYwell 2021-06-22 10:18:48 +02:00
parent ca9e371067
commit 0e84cf085b
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java
View File

@ -62,14 +62,13 @@ public class BukkitPlayerManager extends PlayerManager<BukkitPlayer, Player> {
@NonNull @NonNull
@Override @Override
public BukkitPlayer getPlayer(final @NonNull Player object) { public BukkitPlayer getPlayer(final @NonNull Player object) {
if (object.getUniqueId().version() == 2) { // not a real player
return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, object, false, this.permissionHandler);
}
if (!object.isOnline()) { if (!object.isOnline()) {
throw new NoSuchPlayerException(object.getUniqueId()); throw new NoSuchPlayerException(object.getUniqueId());
} }
try { return getPlayer(object.getUniqueId());
return getPlayer(object.getUniqueId());
} catch (final NoSuchPlayerException exception) {
return new BukkitPlayer(this.plotAreaManager, this.eventDispatcher, object, false, this.permissionHandler);
}
} }
@Override @Override

5
Core/src/main/java/com/plotsquared/core/util/PlayerManager.java
View File

@ -314,11 +314,6 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
super(String.format("There is no online player with UUID '%s'", uuid.toString())); super(String.format("There is no online player with UUID '%s'", uuid.toString()));
} }
@Override
public synchronized Throwable fillInStackTrace() {
return this;
}
} }
} }