Fixed customodeldata, added world switch event

KartoffelChipss · Apr 28, 2024 · da46d85 · da46d85
1 parent 16398b8
commit da46d85
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.strassburger</groupId>
   <artifactId>LifeStealZ</artifactId>
   <name>LifeStealZ</name>
-  <version>1.1.2</version>
+  <version>1.1.3</version>
   <description>A LifeSteal SMP plugin providing you all the features you need!</description>
   <build>
     <resources>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.strassburger</groupId>
     <artifactId>LifeStealZ</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
     <packaging>jar</packaging>
 
     <name>LifeStealZ</name>

diff --git a/src/main/java/org/strassburger/lifestealz/listeners/WorldSwitchListener.java b/src/main/java/org/strassburger/lifestealz/listeners/WorldSwitchListener.java
@@ -0,0 +1,28 @@
+package org.strassburger.lifestealz.listeners;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
+import org.strassburger.lifestealz.LifeStealZ;
+import org.strassburger.lifestealz.util.storage.PlayerData;
+
+import java.util.List;
+
+public class WorldSwitchListener implements Listener {
+    @EventHandler
+    public void onWorldSwitch(PlayerChangedWorldEvent event) {
+        Player player = event.getPlayer();
+
+        List<String> worldWhitelist = LifeStealZ.getInstance().getConfig().getStringList("worlds");
+
+        if (worldWhitelist.contains(player.getLocation().getWorld().getName())) {
+            PlayerData playerData = LifeStealZ.getInstance().getPlayerDataStorage().load(player.getUniqueId());
+            LifeStealZ.setMaxHealth(player, playerData.getMaxhp());
+
+            if (!worldWhitelist.contains(event.getFrom().getName())) player.setHealth(playerData.getMaxhp());
+        } else {
+            LifeStealZ.setMaxHealth(player, 20.0);
+        }
+    }
+}
diff --git a/src/main/java/org/strassburger/lifestealz/util/CustomItemManager.java b/src/main/java/org/strassburger/lifestealz/util/CustomItemManager.java
@@ -36,7 +36,7 @@ public static ItemStack createCustomItem(String itemId) {
         CustomItem ci = new CustomItem(Material.valueOf(config.getString("items." + itemId + ".material")))
                 .setName(config.getString("items." + itemId + ".name"))
                 .setLore(config.getStringList("items." + itemId + ".lore"))
-                .setCustomModelID(config.getInt("items." + itemId + ".customModelID"))
+                .setCustomModelID(config.getInt("items." + itemId + ".customModelData"))
                 .setEnchanted(config.getBoolean("items." + itemId + ".enchanted"))
                 .addFlag(ItemFlag.HIDE_ATTRIBUTES);
 

diff --git a/src/main/java/org/strassburger/lifestealz/util/EventManager.java b/src/main/java/org/strassburger/lifestealz/util/EventManager.java
@@ -21,6 +21,7 @@ public static void registerListeners() {
         registerListener(new InventoryCloseListener());
         registerListener(new InventoryClickListener());
         registerListener(new PlayerDeathListener());
+        registerListener(new WorldSwitchListener());
     }
 
     /**