forked from MagicBane/Server
teleport method removed form PLayerCharacter to use AbstractCharacter.teleport instead
This commit is contained in:
@@ -120,7 +120,6 @@ public class PlayerCharacter extends AbstractCharacter {
|
|||||||
protected ArrayList<CharacterRune> runes;
|
protected ArrayList<CharacterRune> runes;
|
||||||
private BaseClass baseClass;
|
private BaseClass baseClass;
|
||||||
private PromotionClass promotionClass;
|
private PromotionClass promotionClass;
|
||||||
private long channelMute = 0; // none muted.
|
|
||||||
private ConcurrentHashMap<Integer, String> ignoredPlayerIDs = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
|
private ConcurrentHashMap<Integer, String> ignoredPlayerIDs = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
|
||||||
private boolean lfGroup = false;
|
private boolean lfGroup = false;
|
||||||
private boolean lfGuild = false;
|
private boolean lfGuild = false;
|
||||||
@@ -5433,14 +5432,6 @@ public class PlayerCharacter extends AbstractCharacter {
|
|||||||
return characterHeight;
|
return characterHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCharacterHeight(float characterHeight) {
|
|
||||||
this.characterHeight = characterHeight;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setCenterHeight(float centerHeight) {
|
|
||||||
this.centerHeight = centerHeight;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isEnteredWorld() {
|
public boolean isEnteredWorld() {
|
||||||
return enteredWorld;
|
return enteredWorld;
|
||||||
}
|
}
|
||||||
@@ -5449,39 +5440,10 @@ public class PlayerCharacter extends AbstractCharacter {
|
|||||||
this.enteredWorld = enteredWorld;
|
this.enteredWorld = enteredWorld;
|
||||||
}
|
}
|
||||||
|
|
||||||
public long getChannelMute() {
|
|
||||||
return channelMute;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setChannelMute(long channelMute) {
|
|
||||||
this.channelMute = channelMute;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isLastSwimming() {
|
public boolean isLastSwimming() {
|
||||||
return lastSwimming;
|
return lastSwimming;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isTeleporting() {
|
|
||||||
return isTeleporting;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTeleporting(boolean isTeleporting) {
|
|
||||||
this.isTeleporting = isTeleporting;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public final void teleport(final Vector3fImmutable targetLoc) {
|
|
||||||
|
|
||||||
locationLock.writeLock().lock();
|
|
||||||
|
|
||||||
try {
|
|
||||||
MovementManager.translocate(this, targetLoc);
|
|
||||||
} catch (Exception e) {
|
|
||||||
Logger.error(e);
|
|
||||||
} finally {
|
|
||||||
locationLock.writeLock().unlock();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public ReadWriteLock getTeleportLock() {
|
public ReadWriteLock getTeleportLock() {
|
||||||
return teleportLock;
|
return teleportLock;
|
||||||
|
|||||||
Reference in New Issue
Block a user