Fix issue #6

bomp spigot version in build file
xsmeths · Nov 21, 2023 · 722c103 · 722c103
1 parent 02cf5a4
commit 722c103
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.19.4-R0.1-SNAPSHOT</version>
+            <version>1.20.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/me/smeths/and/rhetorical/Handlers/MedicalHandler.java b/src/main/java/me/smeths/and/rhetorical/Handlers/MedicalHandler.java
@@ -30,6 +30,7 @@ public MedicalHandler(final Player p, CustomItem item) {
     }
     HealingPlayers.put(p, new BukkitRunnable() {
         final Location position = p.getLocation();
+        boolean cancelled = false;
         final int total = 60;
         int progress = 0;
         final int duration = 20 * item.getRegen_time();
@@ -39,14 +40,20 @@ public void cancel() {
                 super.cancel();
               }
               public void run() {
-            boolean cancelled = p.getLocation().distance(position) > 0.75D;
+            if (position.getWorld() != p.getWorld() || p.getLocation().distance(position) > 0.75D) {
+                cancelled = true;
+            }
             if ((progress > total) || (cancelled)) {
                 if (cancelled) {
                     if (item.isDropifnotused()) {
                         p.getWorld().dropItem(p.getLocation(), item.getItem());
                     }
                     if (!item.isDropifnotused()) {
-                        p.getInventory().addItem(item.getItem());
+                        if (p.getInventory().firstEmpty() == -1) {
+                            p.getWorld().dropItem(p.getLocation(), item.getItem());
+                        } else {
+                            p.getInventory().addItem(item.getItem());
+                        }
                     }
                 }
                 MedicalHandler.HealingPlayers.remove(p);