1.1-R4 build for Tekkit;

krinsdeath · May 24, 2012 · ed6ff7d · ed6ff7d
1 parent 17fed81
commit ed6ff7d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -41,7 +41,7 @@
     </profiles>
 
     <build>
-        <finalName>${project.name}</finalName>
+        <finalName>${project.name}-Tekkit</finalName>
         <plugins>
             <plugin>
                 <groupId>com.google.code.maven-replacer-plugin</groupId>
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.2.5-R1.0</version>
+            <version>1.1-R4</version>
             <type>jar</type>
         </dependency>
     </dependencies>

diff --git a/src/main/java/net/krinsoft/thecleaner/Cleaner.java b/src/main/java/net/krinsoft/thecleaner/Cleaner.java
@@ -140,9 +140,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                 if (arg.equals("--painting") && check(sender, "painting")) {
                     flags.add(Flag.PAINTING); continue;
                 }
-                if (arg.equals("--golem") && check(sender, "golem")) {
-                    flags.add(Flag.GOLEM); continue;
-                }
                 if (arg.equals("--pet") && check(sender, "pet")) {
                     flags.add(Flag.PET); continue;
                 }
@@ -221,9 +218,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
                         if (e instanceof Painting) {
                             painting++;
                         }
-                        if (e instanceof IronGolem && ((IronGolem)e).isPlayerCreated()) {
-                            golem++;
-                        }
                         if (e instanceof Villager) {
                             villager++;
                         }
@@ -280,11 +274,6 @@ public boolean cleanerCheck(Entity e, Set<Flag> flags) {
             // this isn't a vehicle, and vehicle was specified
             return false;
         }
-        if (e instanceof Golem) {
-            if (e instanceof IronGolem && ((IronGolem)e).isPlayerCreated() && !flags.contains(Flag.GOLEM)) {
-                if (!flags.contains(Flag.FORCE)) { return false; }
-            }
-        }
         if (e instanceof Villager && !flags.contains(Flag.VILLAGER)) {
             if (!flags.contains(Flag.FORCE)) { return false; }
         }

diff --git a/src/main/java/net/krinsoft/thecleaner/Flag.java b/src/main/java/net/krinsoft/thecleaner/Flag.java
@@ -10,7 +10,6 @@ public enum Flag {
     ALL,
     VEHICLE,
     PAINTING,
-    GOLEM,
     PET,
     VILLAGER
 }
diff --git a/src/main/java/net/krinsoft/thecleaner/WorldListener.java b/src/main/java/net/krinsoft/thecleaner/WorldListener.java
@@ -44,9 +44,6 @@ void worldLoad(WorldLoadEvent event) {
             if (flag.equals("--painting")) {
                 flags.add(Flag.PAINTING);
             }
-            if (flag.equals("--golem")) {
-                flags.add(Flag.GOLEM);
-            }
             if (flag.equals("--villager")) {
                 flags.add(Flag.VILLAGER);
             }