Upstream
/
mcMMO
mirror of https://github.com/mcMMO-Dev/mcMMO.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MOB_METADATA_KEYS should be immutable

This commit is contained in:
nossr50 2021-11-14 09:36:00 -08:00
parent 8d27e8fccf
commit 9ab4584dfe
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/gmail/nossr50/util/MetadataConstants.java
View File

@ -1,10 +1,10 @@
package com.gmail.nossr50.util;
import com.google.common.collect.ImmutableSet;
import org.bukkit.metadata.FixedMetadataValue;
import org.jetbrains.annotations.NotNull;
import java.util.HashSet;
import java.util.Set;
/**
* Stores our constants related to metadata
@ -48,22 +48,24 @@ public class MetadataConstants {
public static final byte SIMPLE_FLAG_VALUE = (byte) 0x1;
public static final @NotNull Set<String> MOB_METADATA_KEYS;
public static final @NotNull ImmutableSet<String> MOB_METADATA_KEYS;
public static FixedMetadataValue MCMMO_METADATA_VALUE;
static {
MOB_METADATA_KEYS = new HashSet<>();
MOB_METADATA_KEYS.add(MetadataConstants.METADATA_KEY_MOB_SPAWNER_MOB);
MOB_METADATA_KEYS.add(MetadataConstants.METADATA_KEY_EGG_MOB);
MOB_METADATA_KEYS.add(MetadataConstants.METADATA_KEY_NETHER_PORTAL_MOB);
MOB_METADATA_KEYS.add(MetadataConstants.METADATA_KEY_COTW_SUMMONED_MOB);
MOB_METADATA_KEYS.add(MetadataConstants.METADATA_KEY_PLAYER_BRED_MOB);
MOB_METADATA_KEYS.add(MetadataConstants.METADATA_KEY_PLAYER_TAMED_MOB);
MOB_METADATA_KEYS.add(MetadataConstants.METADATA_KEY_EXPLOITED_ENDERMEN);
MOB_METADATA_KEYS.add(MetadataConstants.METADATA_KEY_CUSTOM_NAME_KEY);
MOB_METADATA_KEYS.add(MetadataConstants.METADATA_KEY_RUPTURE);
MOB_METADATA_KEYS.add(MetadataConstants.METADATA_KEY_EXPLOSION_FROM_RUPTURE);
MOB_METADATA_KEYS.add(MetadataConstants.METADATA_KEY_OLD_NAME_KEY);
HashSet<String> temp = new HashSet<>();
temp.add(MetadataConstants.METADATA_KEY_MOB_SPAWNER_MOB);
temp.add(MetadataConstants.METADATA_KEY_EGG_MOB);
temp.add(MetadataConstants.METADATA_KEY_NETHER_PORTAL_MOB);
temp.add(MetadataConstants.METADATA_KEY_COTW_SUMMONED_MOB);
temp.add(MetadataConstants.METADATA_KEY_PLAYER_BRED_MOB);
temp.add(MetadataConstants.METADATA_KEY_PLAYER_TAMED_MOB);
temp.add(MetadataConstants.METADATA_KEY_EXPLOITED_ENDERMEN);
temp.add(MetadataConstants.METADATA_KEY_CUSTOM_NAME_KEY);
temp.add(MetadataConstants.METADATA_KEY_RUPTURE);
temp.add(MetadataConstants.METADATA_KEY_EXPLOSION_FROM_RUPTURE);
temp.add(MetadataConstants.METADATA_KEY_OLD_NAME_KEY);
MOB_METADATA_KEYS = ImmutableSet.copyOf(temp);
}
}

3
src/main/java/com/gmail/nossr50/util/TransientMetadataTools.java
View File

@ -1,10 +1,7 @@
package com.gmail.nossr50.util;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.util.skills.CombatUtils;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.checkerframework.common.returnsreceiver.qual.This;
import org.jetbrains.annotations.NotNull;
public class TransientMetadataTools {