mirror of
https://github.com/CitizensDev/Citizens2.git
synced 2024-09-27 22:58:41 +02:00
Add a test fix for a one off exception
This commit is contained in:
parent
e98cfd5b8e
commit
d3426bc10a
@ -356,8 +356,6 @@ import net.minecraft.world.scores.PlayerTeam;
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public class NMSImpl implements NMSBridge {
|
public class NMSImpl implements NMSBridge {
|
||||||
public static MethodHandle CONNECTION_PACKET_LISTENER = NMS.getSetter(Connection.class, "q");
|
|
||||||
public static MethodHandle CONNECTION_DISCONNECT_LISTENER = NMS.getSetter(Connection.class, "p");
|
|
||||||
public NMSImpl() {
|
public NMSImpl() {
|
||||||
loadEntityTypes();
|
loadEntityTypes();
|
||||||
}
|
}
|
||||||
@ -391,7 +389,7 @@ public class NMSImpl implements NMSBridge {
|
|||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
return success;
|
return success;
|
||||||
};
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addOrRemoveFromPlayerList(org.bukkit.entity.Entity entity, boolean remove) {
|
public void addOrRemoveFromPlayerList(org.bukkit.entity.Entity entity, boolean remove) {
|
||||||
@ -459,7 +457,7 @@ public class NMSImpl implements NMSBridge {
|
|||||||
}
|
}
|
||||||
EnchantmentHelper.doPostHurtEffects(source, target);
|
EnchantmentHelper.doPostHurtEffects(source, target);
|
||||||
EnchantmentHelper.doPostDamageEffects(target, source);
|
EnchantmentHelper.doPostDamageEffects(target, source);
|
||||||
}
|
};
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void cancelMoveDestination(org.bukkit.entity.Entity entity) {
|
public void cancelMoveDestination(org.bukkit.entity.Entity entity) {
|
||||||
@ -1300,6 +1298,9 @@ public class NMSImpl implements NMSBridge {
|
|||||||
public void removeFromWorld(org.bukkit.entity.Entity entity) {
|
public void removeFromWorld(org.bukkit.entity.Entity entity) {
|
||||||
Preconditions.checkNotNull(entity);
|
Preconditions.checkNotNull(entity);
|
||||||
Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
Entity nmsEntity = ((CraftEntity) entity).getHandle();
|
||||||
|
ServerLevel level = (ServerLevel) nmsEntity.level();
|
||||||
|
if (level.getEntity(entity.getEntityId()) == null)
|
||||||
|
return;
|
||||||
((ServerLevel) nmsEntity.level()).getChunkSource().removeEntity(nmsEntity);
|
((ServerLevel) nmsEntity.level()).getChunkSource().removeEntity(nmsEntity);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2498,7 +2499,9 @@ public class NMSImpl implements NMSBridge {
|
|||||||
|
|
||||||
private static final MethodHandle ADVANCEMENTS_PLAYER_SETTER = NMS.getFirstFinalSetter(ServerPlayer.class,
|
private static final MethodHandle ADVANCEMENTS_PLAYER_SETTER = NMS.getFirstFinalSetter(ServerPlayer.class,
|
||||||
PlayerAdvancements.class);
|
PlayerAdvancements.class);
|
||||||
|
|
||||||
private static final MethodHandle ATTRIBUTE_PROVIDER_MAP = NMS.getFirstGetter(AttributeSupplier.class, Map.class);
|
private static final MethodHandle ATTRIBUTE_PROVIDER_MAP = NMS.getFirstGetter(AttributeSupplier.class, Map.class);
|
||||||
|
|
||||||
private static final MethodHandle ATTRIBUTE_PROVIDER_MAP_SETTER = NMS.getFirstFinalSetter(AttributeSupplier.class,
|
private static final MethodHandle ATTRIBUTE_PROVIDER_MAP_SETTER = NMS.getFirstFinalSetter(AttributeSupplier.class,
|
||||||
Map.class);
|
Map.class);
|
||||||
private static final MethodHandle ATTRIBUTE_SUPPLIER = NMS.getFirstGetter(AttributeMap.class,
|
private static final MethodHandle ATTRIBUTE_SUPPLIER = NMS.getFirstGetter(AttributeMap.class,
|
||||||
@ -2513,6 +2516,8 @@ public class NMSImpl implements NMSBridge {
|
|||||||
ServerPlayer.class, boolean.class);
|
ServerPlayer.class, boolean.class);
|
||||||
private static final Map<Class<?>, net.minecraft.world.entity.EntityType<?>> CITIZENS_ENTITY_TYPES = Maps
|
private static final Map<Class<?>, net.minecraft.world.entity.EntityType<?>> CITIZENS_ENTITY_TYPES = Maps
|
||||||
.newHashMap();
|
.newHashMap();
|
||||||
|
public static MethodHandle CONNECTION_DISCONNECT_LISTENER = NMS.getSetter(Connection.class, "p");
|
||||||
|
public static MethodHandle CONNECTION_PACKET_LISTENER = NMS.getSetter(Connection.class, "q");
|
||||||
private static final MethodHandle CRAFT_BOSSBAR_HANDLE_FIELD = NMS.getFirstSetter(CraftBossBar.class,
|
private static final MethodHandle CRAFT_BOSSBAR_HANDLE_FIELD = NMS.getFirstSetter(CraftBossBar.class,
|
||||||
ServerBossEvent.class);
|
ServerBossEvent.class);
|
||||||
private static final float DEFAULT_SPEED = 1F;
|
private static final float DEFAULT_SPEED = 1F;
|
||||||
|
Loading…
Reference in New Issue
Block a user