remove deprecation event...

Signed-off-by: j502647092 <jtb1@163.com>

src/com/bekvon/bukkit/residence/event/ResidenceEnterEvent.java

@@ -1,38 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package com.bekvon.bukkit.residence.event;
-
-import com.bekvon.bukkit.residence.protection.ClaimedResidence;
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-
-/**
- * Note: This event has been replaced with {@link ResidenceChangedEvent} and is marked as
- * deprecated as of 21-MAY-2013. It will be removed in future releases. Please see
- * {@link ResidenceChangedEvent} comments for further information.
- * 
- * TODO - Remove this class at a suitable time in the future.
- * 
- * @author Administrator
- */
-@Deprecated
-public class ResidenceEnterEvent extends ResidencePlayerEvent {
-
-    private static final HandlerList handlers = new HandlerList();
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    public ResidenceEnterEvent(ClaimedResidence resref, Player player)
-    {
-        super("RESIDENCE_ENTER", resref, player);
-    }
-}

src/com/bekvon/bukkit/residence/event/ResidenceLeaveEvent.java

@@ -1,38 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package com.bekvon.bukkit.residence.event;
-
-import com.bekvon.bukkit.residence.protection.ClaimedResidence;
-import org.bukkit.entity.Player;
-import org.bukkit.event.HandlerList;
-
-/**
- * Note: This event has been replaced with {@link ResidenceChangedEvent} and is marked as
- * deprecated as of 21-MAY-2013. It will be removed in future releases. Please see
- * {@link ResidenceChangedEvent} comments for further information.
- * 
- * TODO - Remove this class at a suitable time in the future.
- * 
- * @author Administrator
- */
-@Deprecated
-public class ResidenceLeaveEvent extends ResidencePlayerEvent {
-
-    private static final HandlerList handlers = new HandlerList();
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    public ResidenceLeaveEvent(ClaimedResidence resref, Player player)
-    {
-        super("RESIDENCE_LEAVE", resref, player);
-    }
-}

src/com/bekvon/bukkit/residence/listeners/ResidencePlayerListener.java

@@ -41,8 +41,6 @@ import org.bukkit.plugin.Plugin;
 import com.bekvon.bukkit.residence.Residence;
 import com.bekvon.bukkit.residence.chat.ChatChannel;
 import com.bekvon.bukkit.residence.event.ResidenceChangedEvent;
-import com.bekvon.bukkit.residence.event.ResidenceEnterEvent;
-import com.bekvon.bukkit.residence.event.ResidenceLeaveEvent;
 import com.bekvon.bukkit.residence.permissions.PermissionGroup;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.FlagPermissions;
@@ -126,13 +124,6 @@ public class ResidencePlayerListener implements Listener {
 			lastOutsideLoc.put(pname, loc);
 			if (ResOld != null) {
 				String leave = ResOld.getLeaveMessage();
-				/*
-				 * TODO - ResidenceLeaveEvent is deprecated as of 21-MAY-2013. Its functionality is
-				 * replaced by ResidenceChangedEvent. For now, this event is still supported until
-				 * it is removed at a suitable time in the future.
-				 */
-				ResidenceLeaveEvent leaveevent = new ResidenceLeaveEvent(ResOld, player);
-				Residence.getServ().getPluginManager().callEvent(leaveevent);
 
 				// New ResidenceChangeEvent
 				ResidenceChangedEvent chgEvent = new ResidenceChangedEvent(ResOld, null, player);
@@ -182,14 +173,6 @@ public class ResidencePlayerListener implements Listener {
 				String leave = ResOld.getLeaveMessage();
 				chgFrom = ResOld;
 
-				/*
-				 * TODO - ResidenceLeaveEvent is deprecated as of 21-MAY-2013. Its functionality is
-				 * replaced by ResidenceChangedEvent. For now, this event is still supported until
-				 * it is removed at a suitable time in the future.
-				 */
-				ResidenceLeaveEvent leaveevent = new ResidenceLeaveEvent(ResOld, player);
-				Residence.getServ().getPluginManager().callEvent(leaveevent);
-
 				if (leave != null && !leave.equals("") && ResOld != res.getParent()) {
 					if (Residence.getConfigManager().useActionBar()) {
 						ActionBar.send(player, (new StringBuilder()).append(ChatColor.YELLOW)
@@ -203,14 +186,6 @@ public class ResidencePlayerListener implements Listener {
 			}
 			String enterMessage = res.getEnterMessage();
 
-			/*
-			 * TODO - ResidenceEnterEvent is deprecated as of 21-MAY-2013. Its functionality is
-			 * replaced by ResidenceChangedEvent. For now, this event is still supported until it is
-			 * removed at a suitable time in the future.
-			 */
-			ResidenceEnterEvent enterevent = new ResidenceEnterEvent(res, player);
-			Residence.getServ().getPluginManager().callEvent(enterevent);
-
 			// New ResidenceChangedEvent
 			ResidenceChangedEvent chgEvent = new ResidenceChangedEvent(chgFrom, res, player);
 			Residence.getServ().getPluginManager().callEvent(chgEvent);