Removing Nethrar and WXtreme support since they're extremely out-of-d…

…ate.
N3X15 · Jan 29, 2012 · 057da87 · 057da87 · akrieger · Feb 2, 2012
1 parent 2494d05
commit 057da87
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 49 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,21 +60,25 @@
             <artifactId>LWC</artifactId>
             <version>3.53</version>
         </dependency>
+        <!-- 
         <dependency>
             <groupId>org.akrieger</groupId>
             <artifactId>Nethrar</artifactId>
             <version>2.0</version>
         </dependency>
+        -->
         <dependency>
             <groupId>org.yi.acru.bukkit</groupId>
             <artifactId>Lockette</artifactId>
             <version>1.3.8</version>
         </dependency>
+        <!-- 
         <dependency>
             <groupId>de.luricos.bukkit.WormholeXTreme</groupId>
             <artifactId>Wormhole</artifactId>
             <version>1.011</version>
         </dependency>
+        -->
         <dependency>
         	<groupId>me.taylorkelly</groupId>
         	<artifactId>bigbrother</artifactId>

diff --git a/src/com/afforess/minecartmaniacore/MinecartManiaCore.java b/src/com/afforess/minecartmaniacore/MinecartManiaCore.java
@@ -9,7 +9,6 @@
 
 import javax.persistence.PersistenceException;
 
-import org.akrieger.Nethrar.NethrarMinecartTeleportEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Entity;
@@ -26,8 +25,6 @@
 import com.afforess.minecartmaniacore.minecart.MinecartOwner;
 import com.afforess.minecartmaniacore.world.Item;
 
-import de.luricos.bukkit.WormholeXTreme.Wormhole.events.StargateMinecartTeleportEvent;
-
 public class MinecartManiaCore extends JavaPlugin {
 
     public static final MinecartManiaCoreListener listener = new MinecartManiaCoreListener();
@@ -242,11 +239,9 @@ public static boolean isLWCEnabled() {
     }
 
     public static void callEvent(final Event event) {
-        if (event instanceof NethrarMinecartTeleportEvent) {
-            listener.onNethrarEvent((NethrarMinecartTeleportEvent) event);
-        } else if (event instanceof StargateMinecartTeleportEvent) {
-            listener.onWormholeExtremeEvent((StargateMinecartTeleportEvent) event);
-        }
+        /*
+         * if (event instanceof NethrarMinecartTeleportEvent) { listener.onNethrarEvent((NethrarMinecartTeleportEvent) event); } else if (event instanceof StargateMinecartTeleportEvent) { listener.onWormholeExtremeEvent((StargateMinecartTeleportEvent) event); }
+         */
         //now everyone else goes
         Bukkit.getServer().getPluginManager().callEvent(event);
     }

diff --git a/src/com/afforess/minecartmaniacore/event/MinecartManiaListener.java b/src/com/afforess/minecartmaniacore/event/MinecartManiaListener.java
@@ -1,16 +1,7 @@
 package com.afforess.minecartmaniacore.event;
 
-import org.akrieger.Nethrar.NethrarMinecartTeleportEvent;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.afforess.minecartmaniacore.MinecartManiaCore;
-import com.afforess.minecartmaniacore.minecart.MinecartManiaMinecart;
-import com.afforess.minecartmaniacore.world.MinecartManiaWorld;
-
-import de.luricos.bukkit.WormholeXTreme.Wormhole.events.StargateMinecartTeleportEvent;
-
 public class MinecartManiaListener implements Listener {
 
     public MinecartManiaListener() {
@@ -191,36 +182,9 @@ public void onMinecartMeetConditionEvent(final MinecartMeetsConditionEvent event
     public void onMinecartPassengerEjectEvent(final MinecartPassengerEjectEvent event) {
 
     }
-
-    @EventHandler(priority = EventPriority.NORMAL)
-    public void onWormholeExtremeEvent(final StargateMinecartTeleportEvent event) {
-        //Special case
-        if (MinecartManiaCore.isWormholeXTremeEnabled()) {
-            try {
-                final StargateMinecartTeleportEvent e = event;
-                final MinecartManiaMinecart oldMinecart = MinecartManiaWorld.getMinecartManiaMinecart(e.getOldMinecart());
-                oldMinecart.copy(e.getNewMinecart());
-                oldMinecart.kill(false);
-                return;
-            } catch (final Exception e) {
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.NORMAL)
-    public void onNethrarEvent(final NethrarMinecartTeleportEvent event) {
-        if (MinecartManiaCore.isNethrarEnabled()) {
-            try {
-                if (event instanceof NethrarMinecartTeleportEvent) {
-                    final NethrarMinecartTeleportEvent e = event;
-                    final MinecartManiaMinecart oldMinecart = MinecartManiaWorld.getMinecartManiaMinecart(e.getOldCart());
-                    oldMinecart.copy(e.getNewCart());
-                    oldMinecart.kill(false);
-                    return;
-                }
-            } catch (final Exception e) {
-            }
-        }
-    }
-
+    /*
+     * @EventHandler(priority = EventPriority.NORMAL) public void onWormholeExtremeEvent(final StargateMinecartTeleportEvent event) { //Special case if (MinecartManiaCore.isWormholeXTremeEnabled()) { try { final StargateMinecartTeleportEvent e = event; final MinecartManiaMinecart oldMinecart = MinecartManiaWorld.getMinecartManiaMinecart(e.getOldMinecart()); oldMinecart.copy(e.getNewMinecart()); oldMinecart.kill(false); return; } catch (final Exception e) { } } }
+     * 
+     * @EventHandler(priority = EventPriority.NORMAL) public void onNethrarEvent(final NethrarMinecartTeleportEvent event) { if (MinecartManiaCore.isNethrarEnabled()) { try { if (event instanceof NethrarMinecartTeleportEvent) { final NethrarMinecartTeleportEvent e = event; final MinecartManiaMinecart oldMinecart = MinecartManiaWorld.getMinecartManiaMinecart(e.getOldCart()); oldMinecart.copy(e.getNewCart()); oldMinecart.kill(false); return; } } catch (final Exception e) { } } }
+     */
 }