v0.1.12

Weather now clears (MultiplayerSleep) Added armor stand protection (PlayerGraves) Added retrieved-items lang (PlayerGraves) Fix issue with drops (PlayerGraves) Fix void edge cases (PlayerGraves)
MC-Machinations · Jul 27, 2020 · 8ddb9a0 · 8ddb9a0
1 parent 3dae6d9
commit 8ddb9a0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.machinemaker</groupId>
     <artifactId>vanillatweaks</artifactId>
-    <version>0.1.11</version>
+    <version>0.1.12</version>
     <packaging>jar</packaging>
 
     <name>VanillaTweaks</name>

diff --git a/src/main/java/me/machinemaker/vanillatweaks/Lang.java b/src/main/java/me/machinemaker/vanillatweaks/Lang.java
@@ -28,6 +28,7 @@ public enum Lang {
 
     // PlayerGraves
     GRAVE_AT("playergraves.", "&eYour grave is at x=%x% y=%y%, z=%z%"),
+    RETRIEVED_ITEMS("playergraves.", "&eRetrieved items."),
 
     // SetHome
     HOME_LIMIT("sethome.", "&eYou have reached the limit for setting your home."),

diff --git a/src/main/java/me/machinemaker/vanillatweaks/multiplayersleep/MultiplayerSleep.java b/src/main/java/me/machinemaker/vanillatweaks/multiplayersleep/MultiplayerSleep.java
@@ -52,7 +52,9 @@ public void onPlayerBedEnter(PlayerBedEnterEvent event) {
 
             if ((double) currentWorldSleeping.size() / (double) world.getPlayers().size() >= config.sleepPercentage) {
                 event.getPlayer().getWorld().setTime(0);
-
+                event.getPlayer().getWorld().setThundering(false);
+                event.getPlayer().getWorld().setWeatherDuration(0);
+                event.getPlayer().getWorld().setStorm(false);
             }
         });
     }

diff --git a/src/main/java/me/machinemaker/vanillatweaks/playergraves/PlayerGraves.java b/src/main/java/me/machinemaker/vanillatweaks/playergraves/PlayerGraves.java
@@ -63,10 +63,25 @@ public void onPlayerDeath(PlayerDeathEvent event) {
         if (config.disabledWorlds.contains(event.getEntity().getWorld().getName())) return;
 
         Block spawnBlock = event.getEntity().getLocation().getBlock();
-        while (spawnBlock.getType() == Material.AIR) {
-            // TODO: What if you get killed in the void?
-            spawnBlock = spawnBlock.getRelative(BlockFace.DOWN);
+        if (event.getEntity().getLocation().getBlockY() <= 0) {
+            spawnBlock = event.getEntity().getLocation().add(0, -event.getEntity().getLocation().getBlockY(), 0).getBlock();
+            while (spawnBlock.getRelative(BlockFace.UP).getType() != Material.AIR) {
+                spawnBlock = spawnBlock.getRelative(BlockFace.UP);
+            }
+            if (spawnBlock.getType() == Material.AIR) {
+                spawnBlock.setType(Material.COBBLESTONE);
+            }
+        } else {
+            while (spawnBlock.getType() == Material.AIR) {
+                spawnBlock = spawnBlock.getRelative(BlockFace.DOWN);
+                if (spawnBlock.getLocation().getBlockY() < 0) {
+                    spawnBlock = event.getEntity().getLocation().getBlock().getRelative(BlockFace.DOWN);
+                    spawnBlock.setType(Material.COBBLESTONE);
+                    break;
+                }
+            }
         }
+
         Location location = spawnBlock.getRelative(BlockFace.UP).getLocation().add(0.5, 0, 0.5);
         PlayerInventory inventory = event.getEntity().getInventory();
         List<ItemStack> drops = event.getDrops();
@@ -108,7 +123,7 @@ public void onPlayerSneak(PlayerToggleSneakEvent event) {
                 return;
             }
             for (ItemStack stack : event.getPlayer().getInventory().getContents()) {
-                if (stack != null) event.getPlayer().getLocation().getWorld().dropItemNaturally(event.getPlayer().getLocation(), stack);
+                if (stack != null) event.getPlayer().getLocation().getWorld().dropItem(event.getPlayer().getLocation(), stack).setPickupDelay(0);
             }
             PlayerInventory inventory = event.getPlayer().getInventory();
             ItemStack[] allContents = container.get(PLAYER_ALL_CONTENTS, DataType.ITEMSTACK_ARRAY);