Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-06-22 20:44:56 +02:00
Code Issues Projects Releases Wiki Activity

Fix player invisibility part 1

Browse Source
This commit is contained in:
fullwall 2014-11-30 13:32:35 +08:00
parent 1b02573b9c
commit 6ca4834e70
3 changed files with 9 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
View File

@ -1,8 +1,6 @@
package net.citizensnpcs.npc.entity;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.net.Socket;
import java.util.List;
@ -27,6 +25,7 @@ import net.minecraft.server.v1_8_R1.BlockPosition;
import net.minecraft.server.v1_8_R1.Entity;
import net.minecraft.server.v1_8_R1.EntityPlayer;
import net.minecraft.server.v1_8_R1.EnumGamemode;
import net.minecraft.server.v1_8_R1.EnumPlayerInfoAction;
import net.minecraft.server.v1_8_R1.EnumProtocolDirection;
import net.minecraft.server.v1_8_R1.GenericAttributes;
import net.minecraft.server.v1_8_R1.MathHelper;
@ -145,21 +144,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
}
private Packet getListPacket(Player player, boolean removeFromPlayerList) {
if (PLAYER_INFO_CONSTRUCTOR != null) {
try {
return PLAYER_INFO_CONSTRUCTOR.newInstance(player.getPlayerListName(), !removeFromPlayerList,
removeFromPlayerList ? 9999 : ping);
} catch (Exception e) {
}
} else {
try {
return (Packet) (removeFromPlayerList ? PLAYER_INFO_REMOVE_METHOD.invoke(null,
((CraftPlayer) player).getHandle()) : PLAYER_INFO_ADD_METHOD.invoke(null,
((CraftPlayer) player).getHandle()));
} catch (Exception e) {
}
}
return null;
return new PacketPlayOutPlayerInfo(removeFromPlayerList ? EnumPlayerInfoAction.REMOVE_PLAYER
: EnumPlayerInfoAction.ADD_PLAYER, ((CraftPlayer) player).getHandle());
}
public NavigationAbstract getNavigation() {
@ -313,7 +299,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
break;
}
}
NMS.sendToOnline(getListPacket(getBukkitEntity(), true));
// NMS.sendToOnline(getListPacket(getBukkitEntity(), true));
if (otherOnline != null) {
NMS.sendToOnline(getListPacket(otherOnline, false));
}
@ -373,22 +359,4 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
private static final float EPSILON = 0.005F;
private static final Location LOADED_LOCATION = new Location(null, 0, 0, 0);
private static Method PLAYER_INFO_ADD_METHOD;
private static Constructor<PacketPlayOutPlayerInfo> PLAYER_INFO_CONSTRUCTOR;
private static Method PLAYER_INFO_REMOVE_METHOD;
static {
try {
PLAYER_INFO_CONSTRUCTOR = PacketPlayOutPlayerInfo.class.getConstructor(String.class, boolean.class,
int.class);
} catch (Exception e) {
}
try {
PLAYER_INFO_ADD_METHOD = PacketPlayOutPlayerInfo.class.getMethod("addPlayer", EntityPlayer.class);
PLAYER_INFO_REMOVE_METHOD = PacketPlayOutPlayerInfo.class.getMethod("removePlayer", EntityPlayer.class);
PLAYER_INFO_ADD_METHOD.setAccessible(true);
PLAYER_INFO_REMOVE_METHOD.setAccessible(true);
} catch (Exception e) {
}
}
}

3
src/main/java/net/citizensnpcs/npc/entity/HumanController.java
View File

@ -17,6 +17,8 @@ import net.citizensnpcs.api.util.Colorizer;
import net.citizensnpcs.api.util.Messaging;
import net.citizensnpcs.npc.AbstractEntityController;
import net.citizensnpcs.util.NMS;
import net.minecraft.server.v1_8_R1.EnumPlayerInfoAction;
import net.minecraft.server.v1_8_R1.PacketPlayOutPlayerInfo;
import net.minecraft.server.v1_8_R1.PlayerInteractManager;
import net.minecraft.server.v1_8_R1.WorldServer;
@ -81,6 +83,7 @@ public class HumanController extends AbstractEntityController {
npc.data().get("removefromplayerlist", removeFromPlayerList));
}
}, 1);
NMS.sendToOnline(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, handle));
handle.getBukkitEntity().setSleepingIgnored(true);
return handle.getBukkitEntity();
}

4
src/main/java/net/citizensnpcs/util/Util.java
View File

@ -123,8 +123,8 @@ public class Util {
public static <T extends Enum<?>> T matchEnum(T[] values, String toMatch) {
toMatch = toMatch.toLowerCase().replace('-', '_').replace(' ', '_');
for (T check : values) {
if (toMatch.equals(check.name().toLowerCase()) || toMatch.equals("item")
&& check == EntityType.DROPPED_ITEM) {
if (toMatch.equals(check.name().toLowerCase())
|| (toMatch.equals("item") && check == EntityType.DROPPED_ITEM)) {
return check; // check for an exact match first
}
}