Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-03 06:57:41 +01:00
Code Issues Projects Releases Wiki Activity

Simplify noDamageTicks

Browse Source
This commit is contained in:
fullwall 2024-12-10 18:51:51 +08:00
parent fb300c38fa
commit d8cc7b6f94
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View File

@ -410,10 +410,8 @@ public class CitizensNPC extends AbstractNPC {
} else if (data().has(NPC.Metadata.AGGRESSIVE)) { } else if (data().has(NPC.Metadata.AGGRESSIVE)) {
NMS.setAggressive(entity, data().<Boolean> get(NPC.Metadata.AGGRESSIVE)); NMS.setAggressive(entity, data().<Boolean> get(NPC.Metadata.AGGRESSIVE));
} }
if (SUPPORT_NODAMAGE_TICKS) { entity.setNoDamageTicks(data().get(NPC.Metadata.SPAWN_NODAMAGE_TICKS,
entity.setNoDamageTicks(data().get(NPC.Metadata.SPAWN_NODAMAGE_TICKS, Setting.DEFAULT_SPAWN_NODAMAGE_DURATION.asTicks()));
Setting.DEFAULT_SPAWN_NODAMAGE_DURATION.asTicks()));
}
} }
if (requiresNameHologram() && !hasTrait(HologramTrait.class)) { if (requiresNameHologram() && !hasTrait(HologramTrait.class)) {
addTrait(HologramTrait.class); addTrait(HologramTrait.class);
@ -614,16 +612,10 @@ public class CitizensNPC extends AbstractNPC {
private static final SetMultimap<ChunkCoord, NPC> CHUNK_LOADERS = HashMultimap.create(); private static final SetMultimap<ChunkCoord, NPC> CHUNK_LOADERS = HashMultimap.create();
private static boolean SUPPORT_ATTRIBUTES = false; private static boolean SUPPORT_ATTRIBUTES = false;
private static boolean SUPPORT_GLOWING = false; private static boolean SUPPORT_GLOWING = false;
private static boolean SUPPORT_NODAMAGE_TICKS = false;
private static boolean SUPPORT_PICKUP_ITEMS = false; private static boolean SUPPORT_PICKUP_ITEMS = false;
private static boolean SUPPORT_SILENT = false; private static boolean SUPPORT_SILENT = false;
private static boolean SUPPORT_USE_ITEM = true; private static boolean SUPPORT_USE_ITEM = true;
static { static {
try {
Entity.class.getMethod("setNoDamageTicks", int.class);
SUPPORT_NODAMAGE_TICKS = true;
} catch (NoSuchMethodException | SecurityException e) {
}
try { try {
Entity.class.getMethod("setGlowing", boolean.class); Entity.class.getMethod("setGlowing", boolean.class);
SUPPORT_GLOWING = true; SUPPORT_GLOWING = true;