SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change setGameProfile to setSkin and add logic for it

Browse Source
This commit is contained in:
libraryaddict
2014-06-06 00:08:54 +12:00
parent 708b184fa5
commit e3ca6c5b74
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
View File

@@ -2,6 +2,7 @@ package me.libraryaddict.disguise.disguisetypes;
import java.util.UUID; import java.util.UUID;
import org.apache.commons.lang.Validate;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import com.comphenix.protocol.wrappers.WrappedGameProfile; import com.comphenix.protocol.wrappers.WrappedGameProfile;
@@ -82,12 +83,6 @@ public class PlayerDisguise extends TargetedDisguise {
return true; return true;
} }
@Deprecated
public void setGameProfile(WrappedGameProfile gameProfile) {
this.gameProfile = ReflectionManager.getGameProfileWithThisSkin(
gameProfile.getId() != null ? UUID.fromString(gameProfile.getId()) : null, getName(), gameProfile);
}
@Deprecated @Deprecated
public void setSkin(String skinToUse) { public void setSkin(String skinToUse) {
this.skinToUse = skinToUse; this.skinToUse = skinToUse;
@@ -104,7 +99,7 @@ public class PlayerDisguise extends TargetedDisguise {
@Override @Override
public void onLookup(WrappedGameProfile gameProfile) { public void onLookup(WrappedGameProfile gameProfile) {
if (currentLookup == this && gameProfile != null) { if (currentLookup == this && gameProfile != null) {
setGameProfile(gameProfile); setSkin(gameProfile);
if (DisguiseUtilities.isDisguiseInUse(PlayerDisguise.this)) { if (DisguiseUtilities.isDisguiseInUse(PlayerDisguise.this)) {
DisguiseUtilities.refreshTrackers(PlayerDisguise.this); DisguiseUtilities.refreshTrackers(PlayerDisguise.this);
if (getEntity() instanceof Player && isSelfDisguiseVisible()) { if (getEntity() instanceof Player && isSelfDisguiseVisible()) {
@@ -116,10 +111,31 @@ public class PlayerDisguise extends TargetedDisguise {
}; };
WrappedGameProfile obj = DisguiseUtilities.getProfileFromMojang(this.skinToUse, currentLookup); WrappedGameProfile obj = DisguiseUtilities.getProfileFromMojang(this.skinToUse, currentLookup);
if (obj != null) { if (obj != null) {
setGameProfile(obj); setSkin(obj);
} }
} }
} }
} }
/**
* Set the GameProfile, without tampering.
*
* @param gameProfile
* GameProfile
*/
@Deprecated
public void setSkin(WrappedGameProfile gameProfile) {
if (gameProfile == null) {
this.gameProfile = null;
this.skinToUse = null;
return;
}
Validate.notEmpty(gameProfile.getName(), "Name must be set");
this.skinToUse = gameProfile.getName();
this.gameProfile = ReflectionManager.getGameProfileWithThisSkin(
gameProfile.getId() != null ? UUID.fromString(gameProfile.getId()) : null, getName(), gameProfile);
}
} }