Update to 1.2.3

3216alec · Mar 23, 2012 · dadca5e · dadca5e
1 parent 7d8c1c1
commit dadca5e
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/src/de/davboecki/multimodworld/plugin/CreatueSpawnListener.java b/src/de/davboecki/multimodworld/plugin/CreatueSpawnListener.java
@@ -6,10 +6,10 @@
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.entity.EntityListener;
 
-public class CreatueSpawnListener extends EntityListener{
+public class CreatueSpawnListener implements Listener {
 	public PrivatChest plugin;
 
 	CreatueSpawnListener(PrivatChest pplugin){

diff --git a/src/de/davboecki/multimodworld/plugin/PrivatChest.java b/src/de/davboecki/multimodworld/plugin/PrivatChest.java
@@ -173,7 +173,7 @@ public void onDisable() {
     public void sendModLoaderPacket(Player player){
     	PacketListener.AllowModLoaderPacket = true;
     	if(MultiModWorld != null) {
-    		ModLoaderMp.HandleAllLogins(((CraftPlayer)player).getHandle());
+    		ModLoaderMp.handleAllLogins(((CraftPlayer)player).getHandle());
     	}
     	PacketListener.AllowModLoaderPacket = false;
     }

diff --git a/src/de/davboecki/multimodworld/plugin/WorldLoadListener.java b/src/de/davboecki/multimodworld/plugin/WorldLoadListener.java
@@ -2,13 +2,13 @@
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.world.WorldListener;
+import org.bukkit.event.Listener;
 import org.bukkit.event.world.WorldLoadEvent;
 
 import de.davboecki.multimodworld.plugin.settings.WorldSetting;
 
 
-public class WorldLoadListener extends WorldListener{
+public class WorldLoadListener implements Listener {
 	PrivatChest plugin;
 
 	WorldLoadListener(PrivatChest instance){

diff --git a/src/de/davboecki/multimodworld/plugin/commandhandler/ConfirmListener.java b/src/de/davboecki/multimodworld/plugin/commandhandler/ConfirmListener.java
@@ -7,13 +7,13 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerChatEvent;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerListener;
 
 import de.davboecki.multimodworld.plugin.PrivatChest;
 
-public class ConfirmListener extends PlayerListener {
+public class ConfirmListener implements Listener {
 
 	private PrivatChest plugin;
 	@SuppressWarnings("rawtypes")

diff --git a/src/de/davboecki/multimodworld/plugin/listener/FurnaceListener.java b/src/de/davboecki/multimodworld/plugin/listener/FurnaceListener.java
@@ -2,15 +2,15 @@
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.FurnaceBurnEvent;
 import org.bukkit.event.inventory.FurnaceSmeltEvent;
-import org.bukkit.event.inventory.InventoryListener;
 import org.bukkit.inventory.ItemStack;
 
 import de.davboecki.multimodworld.plugin.ItemCheckHandler;
 import de.davboecki.multimodworld.plugin.PrivatChest;
 
-public class FurnaceListener extends InventoryListener {
+public class FurnaceListener implements Listener {
 	PrivatChest plugin;
 
 	public FurnaceListener(PrivatChest plugin){

diff --git a/src/de/davboecki/multimodworld/plugin/listener/PlayerPreCommandListener.java b/src/de/davboecki/multimodworld/plugin/listener/PlayerPreCommandListener.java
@@ -3,13 +3,13 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerListener;
 
 import de.davboecki.multimodworld.plugin.ItemCheckHandler;
 import de.davboecki.multimodworld.plugin.PrivatChest;
 
-public class PlayerPreCommandListener extends PlayerListener {
+public class PlayerPreCommandListener implements Listener {
 
 	private PrivatChest plugin;
 	public PlayerPreCommandListener(PrivatChest instance){

diff --git a/src/de/davboecki/multimodworld/plugin/listener/PrivatChestBlockListener.java b/src/de/davboecki/multimodworld/plugin/listener/PrivatChestBlockListener.java
@@ -9,15 +9,15 @@
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockListener;
 import org.bukkit.event.block.BlockPlaceEvent;
 
 import de.davboecki.multimodworld.plugin.PrivatChest;
 import de.davboecki.multimodworld.plugin.RoomGenerator;
 
 
-public class PrivatChestBlockListener extends BlockListener {
+public class PrivatChestBlockListener implements Listener {
     public static PrivatChest plugin;
 
     public PrivatChestBlockListener(PrivatChest pplugin) {

diff --git a/src/de/davboecki/multimodworld/plugin/listener/PrivatChestPlayerListener.java b/src/de/davboecki/multimodworld/plugin/listener/PrivatChestPlayerListener.java
@@ -15,10 +15,10 @@
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerItemHeldEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerListener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
@@ -40,7 +40,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-public class PrivatChestPlayerListener extends PlayerListener {
+public class PrivatChestPlayerListener implements Listener {
     public static PrivatChest plugin;
 
     private static Map<String, Boolean> Teleport = new HashMap<String, Boolean>();

diff --git a/src/de/davboecki/multimodworld/plugin/reteleport/TeleportHandler.java b/src/de/davboecki/multimodworld/plugin/reteleport/TeleportHandler.java
@@ -19,6 +19,7 @@
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.craftbukkit.CraftChunk;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.craftbukkit.CraftWorld;
 import org.bukkit.craftbukkit.entity.CraftPlayer;
@@ -201,7 +202,7 @@ public void HandleJoin(PlayerJoinEvent event, boolean SendPacket) {
 	    	    	((CraftPlayer)player).getHandle().locX = loc.getX();
 	    	    	((CraftPlayer)player).getHandle().locY = loc.getY();
 	    	    	((CraftPlayer)player).getHandle().locZ = loc.getZ();
-	    	    	((CraftPlayer)player).getHandle().netServerHandler.sendPacket(new Packet51MapChunk((((int)loc.getX())>>4)<<4, 0, (((int)loc.getZ())>>4)<<4, 16,  ((CraftWorld)loc.getWorld()).getHandle().height, 16, ((CraftWorld)loc.getWorld()).getHandle()));
+	    	    	((CraftPlayer)player).getHandle().netServerHandler.sendPacket(new Packet51MapChunk(((CraftChunk)world.getChunkAt(player.getLocation())).getHandle(),true,0));
 	    	    	//teleport(player,loc);
 	    	    	//ReTeleportThread.add(10,player,loc);
 		        	if(!SendPacket) {