Merge branch 'mcMMO-Dev:master' into update

Changelog.txt

@@ -1,5 +1,10 @@
+Version 2.2.027
+    Fixed Ricocheted arrows losing some data after a ricochet
+    Fixed concurrency issue with Folia regarding locale strings
+    Fixed concurrency issue with Folia regarding COTW summons
+
 Version 2.2.026
-    Fixed NPE on ChunkUnloadEvent
+    Fixed NullPointerException on ChunkUnloadEvent
 
 Version 2.2.025
     Fixed NullPointerException spam when processing XP for child skills

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.2.026</version>
+    <version>2.2.027-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>

src/main/java/com/gmail/nossr50/listeners/EntityListener.java

@@ -594,7 +594,7 @@ public void onEntityDeathLowest(final EntityDeathEvent event) {
     public void onEntityDeath(final EntityDeathEvent event) {
         final LivingEntity entity = event.getEntity();
 
-        if (mcMMO.getTransientEntityTracker().isTransientSummon(entity)) {
+        if (mcMMO.getTransientEntityTracker().isTransient(entity)) {
             mcMMO.getTransientEntityTracker().removeSummon(entity, null, false);
         }
 

src/main/java/com/gmail/nossr50/locale/LocaleLoader.java

@@ -15,14 +15,16 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public final class LocaleLoader {
     private static final String BUNDLE_ROOT = "com.gmail.nossr50.locale.locale";
     private static final String OVERRIDE_FILE_NAME = "locale_override.properties";
-    private static Map<String, String> bundleCache = new HashMap<>();
+    // Must be concurrent to accomodate Folia
+    private static Map<String, String> bundleCache = new ConcurrentHashMap<>();
     private static ResourceBundle bundle = null;
     private static ResourceBundle filesystemBundle = null;
     private static ResourceBundle enBundle = null;

src/main/java/com/gmail/nossr50/skills/crossbows/CrossbowsManager.java

@@ -64,10 +64,17 @@ private void spawnReflectedArrow(@NotNull Plugin pluginRef, @NotNull Arrow origi
 
         // Spawn new arrow with the reflected direction
         Arrow spawnedArrow = originalArrow.getWorld().spawnArrow(origin, reflectedDirection, 1, 1);
+        // copy some properties from the old arrow
+        spawnedArrow.setShooter(originalArrowShooter);
+        spawnedArrow.setCritical(originalArrow.isCritical());
+        spawnedArrow.setPierceLevel(originalArrow.getPierceLevel());
+        spawnedArrow.setPickupStatus(originalArrow.getPickupStatus());
+        spawnedArrow.setKnockbackStrength(originalArrow.getKnockbackStrength());
+
+        // copy metadata from old arrow
         ProjectileUtils.copyArrowMetadata(pluginRef, originalArrow, spawnedArrow);
         originalArrow.remove();
-        // copy metadata from old arrow
-        spawnedArrow.setShooter(originalArrowShooter);
+        // add important metadata to new arrow
         spawnedArrow.setMetadata(MetadataConstants.METADATA_KEY_BOUNCE_COUNT,
                 new FixedMetadataValue(pluginRef, bounceCount + 1));
         spawnedArrow.setMetadata(MetadataConstants.METADATA_KEY_SPAWNED_ARROW,

src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java

@@ -471,11 +471,12 @@ public boolean isCOTWItem(@NotNull ItemStack itemStack) {
     }
 
     private int getAmountCurrentlySummoned(@NotNull CallOfTheWildType callOfTheWildType) {
-        return mcMMO.getTransientEntityTracker().getAmountCurrentlySummoned(getPlayer().getUniqueId(), callOfTheWildType);
+        return mcMMO.getTransientEntityTracker().summonCountForPlayerOfType(getPlayer().getUniqueId(), callOfTheWildType);
     }
 
     private void addToTracker(@NotNull LivingEntity livingEntity, @NotNull CallOfTheWildType callOfTheWildType) {
-        mcMMO.getTransientEntityTracker().registerEntity(getPlayer().getUniqueId(), new TrackedTamingEntity(livingEntity, callOfTheWildType, getPlayer()));
+        mcMMO.getTransientEntityTracker().addSummon(getPlayer().getUniqueId(),
+                new TrackedTamingEntity(livingEntity, callOfTheWildType, getPlayer()));
     }
 
     /**

src/main/java/com/gmail/nossr50/util/MobMetadataUtils.java

@@ -3,6 +3,7 @@
 import com.gmail.nossr50.api.exceptions.IncompleteNamespacedKeyRegister;
 import com.gmail.nossr50.config.PersistentDataConfig;
 import com.gmail.nossr50.metadata.MobMetaFlagType;
+import com.google.common.collect.MapMaker;
 import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
@@ -12,13 +13,13 @@
 
 import java.util.EnumMap;
 import java.util.HashSet;
-import java.util.WeakHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 import static com.gmail.nossr50.util.MetadataService.*;
 
 //TODO: Use SpawnReason where appropriate instead of MobMetaFlagType
 public final class MobMetadataUtils {
-    private static final @NotNull WeakHashMap<Entity, HashSet<MobMetaFlagType>> mobRegistry; //transient data
+    private static final @NotNull ConcurrentMap<Entity, HashSet<MobMetaFlagType>> mobRegistry; //transient data
     private static final @NotNull EnumMap<MobMetaFlagType, NamespacedKey> mobFlagKeyMap; //used for persistent data
     private static boolean isUsingPersistentData = false;
 
@@ -28,7 +29,14 @@ private MobMetadataUtils() {
 
     static {
         mobFlagKeyMap = new EnumMap<>(MobMetaFlagType.class);
-        mobRegistry = new WeakHashMap<>();
+        // Using Guava for a concurrent weak hash map
+        // IMPORTANT: This type of map uses == for comparison over .equals(),
+        // which is a violation of map contract
+        mobRegistry = new MapMaker()
+                .weakKeys()
+                .concurrencyLevel(4)
+                .makeMap();
+
         initMobFlagKeyMap();
 
         for (MobMetaFlagType metaFlagType : MobMetaFlagType.values()) {
@@ -92,7 +100,7 @@ public static boolean hasMobFlags(@NotNull LivingEntity livingEntity) {
 
             return false;
         } else {
-            return mobRegistry.containsKey(livingEntity) && mobRegistry.get(livingEntity).size() > 0;
+            return mobRegistry.containsKey(livingEntity) && !mobRegistry.get(livingEntity).isEmpty();
         }
     }