From 64b46a88c931abe3427cb2746a118a70b8f8e636 Mon Sep 17 00:00:00 2001 From: GJ Date: Tue, 28 Feb 2012 16:51:58 -0500 Subject: [PATCH] Breaking a bed now clears your spawn, just as if you had used the /clearmyspawn command. --- .../com/gmail/nossr50/datatypes/PlayerProfile.java | 2 +- .../com/gmail/nossr50/listeners/mcBlockListener.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java index dd76a265a..c18691946 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java +++ b/src/main/java/com/gmail/nossr50/datatypes/PlayerProfile.java @@ -1220,7 +1220,7 @@ public class PlayerProfile else return null; } else - return null; + return null; loc.setYaw(0); loc.setPitch(0); diff --git a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java index 06d29ac11..6939c1d64 100644 --- a/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/mcBlockListener.java @@ -25,6 +25,7 @@ import com.gmail.nossr50.spout.SpoutStuff; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.enchantments.Enchantment; @@ -138,9 +139,18 @@ public class mcBlockListener implements Listener int id = block.getTypeId(); ItemStack inhand = player.getItemInHand(); - if (event instanceof FakeBlockBreakEvent) + if(event instanceof FakeBlockBreakEvent) return; + //Reset player spawn back to world spawn if their bed is destroyed. + if(block.getType().equals(Material.BED_BLOCK) && LoadProperties.enableMySpawn && PP.getMySpawn(player) != null) + { + double x = Bukkit.getServer().getWorlds().get(0).getSpawnLocation().getX(); + double y = Bukkit.getServer().getWorlds().get(0).getSpawnLocation().getY(); + double z = Bukkit.getServer().getWorlds().get(0).getSpawnLocation().getZ(); + String worldname = Bukkit.getServer().getWorlds().get(0).getName(); + PP.setMySpawn(x, y, z, worldname); + } /* * HERBALISM */