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

Simplify redundant statements and casts

Browse Source
This commit is contained in:
riking
2014-06-03 18:20:46 -07:00
parent 009df4a0ad
commit 5dce8a22e8
6 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/me/libraryaddict/disguise/commands/DisguiseCommand.java
View File

@@ -22,7 +22,7 @@ public class DisguiseCommand extends BaseDisguiseCommand {
sender.sendMessage(ChatColor.RED + "You may not use this command from the console!");
return true;
}
Disguise disguise = null;
Disguise disguise;
try {
disguise = parseDisguise(sender, args);
} catch (Exception ex) {

2
src/me/libraryaddict/disguise/commands/DisguisePlayerCommand.java
View File

@@ -57,7 +57,7 @@ public class DisguisePlayerCommand extends BaseDisguiseCommand {
}
if (DisguiseConfig.isNameOfPlayerShownAboveDisguise()) {
if (disguise.getWatcher() instanceof LivingWatcher) {
((LivingWatcher) disguise.getWatcher()).setCustomName(((Player) player).getDisplayName());
((LivingWatcher) disguise.getWatcher()).setCustomName(player.getDisplayName());
if (DisguiseConfig.isNameAboveHeadAlwaysVisible()) {
((LivingWatcher) disguise.getWatcher()).setCustomNameVisible(true);
}

7
src/me/libraryaddict/disguise/disguisetypes/MobDisguise.java
View File

@@ -62,11 +62,8 @@ public class MobDisguise extends TargetedDisguise {
}
public boolean doesDisguiseAge() {
if (getWatcher() != null) {
return getWatcher() instanceof AgeableWatcher || getWatcher() instanceof ZombieWatcher;
}
return false;
return getWatcher() != null &&
(getWatcher() instanceof AgeableWatcher || getWatcher() instanceof ZombieWatcher);
}
public boolean isAdult() {

7
src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View File

@@ -443,11 +443,8 @@ public class DisguiseUtilities {
}
public static boolean isDisguiseInUse(Disguise disguise) {
if (disguise.getEntity() != null && getDisguises().containsKey(disguise.getEntity().getUniqueId())
&& getDisguises().get(disguise.getEntity().getUniqueId()).contains(disguise)) {
return true;
}
return false;
return disguise.getEntity() != null && getDisguises().containsKey(disguise.getEntity().getUniqueId())
&& getDisguises().get(disguise.getEntity().getUniqueId()).contains(disguise);
}
/**

7
src/me/libraryaddict/disguise/utilities/PacketsManager.java
View File

@@ -179,7 +179,7 @@ public class PacketsManager {
stringMods.write(i, ((PlayerDisguise) disguise).getName());
}
} else {
Object gameProfile = null;
Object gameProfile;
String name = ((PlayerDisguise) disguise).getName();
boolean removeName = false;
if (!DisguiseUtilities.hasGameProfile(name)) {
@@ -529,8 +529,9 @@ public class PacketsManager {
if (disguise.isSoundsReplaced()) {
String sound = null;
DisguiseSound dSound = DisguiseSound.getType(disguise.getType().name());
if (dSound != null && soundType != null)
if (dSound != null)
sound = dSound.getSound(soundType);
if (sound == null) {
event.setCancelled(true);
} else {
@@ -563,7 +564,7 @@ public class PacketsManager {
if (soundType == SoundType.HURT || soundType == SoundType.DEATH
|| soundType == SoundType.IDLE) {
// If the volume is the default
if (((Float) mods.read(4)).equals(entitySound.getDamageAndIdleSoundVolume())) {
if (mods.read(4).equals(entitySound.getDamageAndIdleSoundVolume())) {
mods.write(4, dSound.getDamageAndIdleSoundVolume());
}
// Here I assume its the default pitch as I can't calculate if its real.

3
src/me/libraryaddict/disguise/utilities/ReflectionManager.java
View File

@@ -151,8 +151,7 @@ public class ReflectionManager {
public static Entity getBukkitEntity(Object nmsEntity) {
try {
Entity bukkitEntity = (Entity) ReflectionManager.getNmsClass("Entity").getMethod("getBukkitEntity").invoke(nmsEntity);
return bukkitEntity;
return (Entity) ReflectionManager.getNmsClass("Entity").getMethod("getBukkitEntity").invoke(nmsEntity);
} catch (Exception ex) {
ex.printStackTrace();
}