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

Don't throw a error if tracker not found. Just run again later

Browse Source
This commit is contained in:
Andrew 2013-08-06 00:22:04 +12:00
parent 9f7b3620ca
commit cd11dc3572
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/me/libraryaddict/disguise/DisguiseAPI.java
View File

@ -38,7 +38,6 @@ import net.minecraft.server.v1_6_R2.WatchableObject;
import net.minecraft.server.v1_6_R2.World; import net.minecraft.server.v1_6_R2.World;
import net.minecraft.server.v1_6_R2.WorldServer; import net.minecraft.server.v1_6_R2.WorldServer;
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity; import org.bukkit.craftbukkit.v1_6_R2.entity.CraftEntity;
@ -212,6 +211,8 @@ public class DisguiseAPI {
soundLoc.getBlockZ())]; soundLoc.getBlockZ())];
if (b != null) if (b != null)
mods.write(0, b.stepSound.getStepSound()); mods.write(0, b.stepSound.getStepSound());
// There is no else statement. Because seriously. This should never be null. Unless someone is
// sending fake sounds. In which case. Why cancel it.
} else { } else {
mods.write(0, sound); mods.write(0, sound);
// Time to change the pitch and volume // Time to change the pitch and volume
@ -278,7 +279,7 @@ public class DisguiseAPI {
soundType = SoundType.HURT; soundType = SoundType.HURT;
} }
if (disSound.getSound(soundType) == null if (disSound.getSound(soundType) == null
|| (hearSelfDisguise && entity == event.getPlayer() && (soundType == SoundType.HURT || soundType == SoundType.DEATH))) { || (soundType != null && hearSelfDisguise && entity == event.getPlayer())) {
disSound = DisguiseSound.getType(disguise.getType().name()); disSound = DisguiseSound.getType(disguise.getType().name());
if (disSound != null) { if (disSound != null) {
String sound = disSound.getSound(soundType); String sound = disSound.getSound(soundType);
@ -470,10 +471,24 @@ public class DisguiseAPI {
} }
} }
private static void setupPlayer(Player player) { private static void setupPlayer(final Player player) {
removeVisibleDisguise(player); removeVisibleDisguise(player);
if (!viewDisguises()) if (!viewDisguises())
return; return;
EntityPlayer entityplayer = ((CraftPlayer) player).getHandle();
EntityTrackerEntry tracker = (EntityTrackerEntry) ((WorldServer) entityplayer.world).tracker.trackedEntities.get(player
.getEntityId());
if (tracker == null) {
// A check incase the tracker is null.
// If it is, then this method will be run again in one tick. Which is when it should be constructed.
Bukkit.getScheduler().scheduleSyncDelayedTask(libsDisguises, new Runnable() {
public void run() {
setupPlayer(player);
}
});
return;
}
tracker.trackedPlayers.add(entityplayer);
int id = 0; int id = 0;
try { try {
Field field = net.minecraft.server.v1_6_R2.Entity.class.getDeclaredField("entityCount"); Field field = net.minecraft.server.v1_6_R2.Entity.class.getDeclaredField("entityCount");
@ -484,14 +499,7 @@ public class DisguiseAPI {
} catch (Exception ex) { } catch (Exception ex) {
ex.printStackTrace(); ex.printStackTrace();
} }
EntityPlayer entityplayer = ((CraftPlayer) player).getHandle();
EntityTrackerEntry tracker = (EntityTrackerEntry) ((WorldServer) entityplayer.world).tracker.trackedEntities.get(player
.getEntityId());
Validate.notNull(tracker,
"If you are disguising as soon as they log in, please wait a tick or 2 for their EntityTracker to be constructed");
tracker.trackedPlayers.add(entityplayer);
// CraftBukkit end
Packet20NamedEntitySpawn packet = new Packet20NamedEntitySpawn((EntityHuman) entityplayer); Packet20NamedEntitySpawn packet = new Packet20NamedEntitySpawn((EntityHuman) entityplayer);
entityplayer.playerConnection.sendPacket(packet); entityplayer.playerConnection.sendPacket(packet);
if (!tracker.tracker.getDataWatcher().d()) { if (!tracker.tracker.getDataWatcher().d()) {