- fixes

Grzybol · Apr 9, 2024 · dee1ddf · dee1ddf
1 parent 80fe767
commit dee1ddf
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>betterbox.mine.game</groupId>
     <artifactId>BetterElo</artifactId>
-    <version>4.1.30-SNAPSHOT</version>
+    <version>4.1.37-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>BetterElo</name>

diff --git a/src/main/java/betterbox/mine/game/betterelo/CustomMobs.java b/src/main/java/betterbox/mine/game/betterelo/CustomMobs.java
@@ -41,13 +41,13 @@ static class CustomMob {
         LivingEntity entity;
         ItemStack helmet, chestplate, leggings, boots,weapon;
         HashMap< Double,ItemStack> dropTable;
-        double armor, speed, attackDamage, EMKSchance, attackSpeed;
-        int hp;
+        double armor, speed, attackDamage, EMKSchance;
+        int hp,attackSpeed;
         Map<String, Object> customMetadata; // Nowe pole do przechowywania niestandardowych metadanych
         JavaPlugin plugin;
         CustomMobsFileManager dropFileManager;
 
-        CustomMob(JavaPlugin plugin,CustomMobsFileManager dropFileManager, String mobName, EntityType entityType, ItemStack helmet, ItemStack chestplate, ItemStack leggings, ItemStack boots,ItemStack weapon, double armor, int hp, double speed, double attackDamage, double attackSpeed, Map<String, Object> customMetadata, String dropTableName, Boolean dropEMKS, double EMKSchance) {
+        CustomMob(JavaPlugin plugin,CustomMobsFileManager dropFileManager, String mobName, EntityType entityType, ItemStack helmet, ItemStack chestplate, ItemStack leggings, ItemStack boots,ItemStack weapon, double armor, int hp, double speed, double attackDamage, int attackSpeed, Map<String, Object> customMetadata, String dropTableName, Boolean dropEMKS, double EMKSchance) {
             this.plugin = plugin;
             this.dropEMKS = dropEMKS;
             this.EMKSchance = EMKSchance;
@@ -118,7 +118,9 @@ private void setupMob() {
             entity.setHealth(hp);
             entity.getAttribute(Attribute.GENERIC_MOVEMENT_SPEED).setBaseValue(speed);
             entity.getAttribute(Attribute.GENERIC_ATTACK_DAMAGE).setBaseValue(attackDamage);
-            entity.getAttribute(Attribute.GENERIC_ATTACK_SPEED).setBaseValue(attackSpeed);
+            //plugin.getLogger().info("attackSpeed: "+attackSpeed);
+            //entity.getAttribute(Attribute.GENERIC_ATTACK_SPEED).setBaseValue(attackSpeed);
+
 
             entity.setCustomName(mobName);
             entity.setCustomNameVisible(true);

diff --git a/src/main/java/betterbox/mine/game/betterelo/CustomMobsFileManager.java b/src/main/java/betterbox/mine/game/betterelo/CustomMobsFileManager.java
@@ -248,9 +248,9 @@ public CustomMobs.CustomMob loadCustomMob(JavaPlugin plugin, FileRewardManager d
             int hp = mobData.getInt("hp");
             double speed = mobData.getDouble("speed");
             double attackDamage = mobData.getDouble("attackDamage");
-            double EKMSchance = 0.0f;
+            double EKMSchance = 0.0d;
             boolean dropEMKS = false;
-            double attackSpeed = 1;
+            int attackSpeed = 1;
 
 
             if(mobData.contains("dropEMKS")){
@@ -262,7 +262,7 @@ public CustomMobs.CustomMob loadCustomMob(JavaPlugin plugin, FileRewardManager d
                 pluginLogger.log(PluginLogger.LogLevel.DEBUG, "CustomMobsFileManager.loadCustomMob loaded EKMSchance:" + EKMSchance);
             }
             if(mobData.contains("attackSpeed")){
-                attackSpeed = mobData.getDouble("AttackSpeed");
+                attackSpeed = mobData.getInt("attackSpeed");
                 pluginLogger.log(PluginLogger.LogLevel.DEBUG, "CustomMobsFileManager.loadCustomMob loaded AttackSpeed:" + attackSpeed);
             }
             String entityTypeString = mobData.getString("type");