Updated to 1.4.6 bukkit and fix fall damage.

Jadedwolf · Jan 7, 2013 · 7ae02d3 · 7ae02d3
1 parent 51b740c
commit 7ae02d3
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 68 deletions.
diff --git a/pom.xml b/pom.xml
@@ -7,26 +7,44 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>jadedwolf.plugins.nofarm</groupId>
     <artifactId>NoFarm</artifactId>
-    <version>0.5</version>
+    <version>0.7</version>
     <name>NoFarm</name>
     <url>http://jadedwolf.com/</url>
     <properties>
-      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <scm>
-    <connection>scm:git:git://github.com/Jadedwolf/NoFarm.git</connection>
-    <url>https://github.com/Jadedwolf/NoFarm</url>
-    <developerConnection>scm:git:git@github.com:Jadedwolf/NoFarm.git</developerConnection>
+        <connection>scm:git:git://github.com/Jadedwolf/NoFarm.git</connection>
+        <url>https://github.com/Jadedwolf/NoFarm</url>
+        <developerConnection>scm:git:git@github.com:Jadedwolf/NoFarm.git</developerConnection>
     </scm>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.3.2-R2.1-SNAPSHOT</version>
-      <type>jar</type>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
+    <repositories>
+        <repository>
+            <id>bukkit-repo</id>
+            <url>http://repo.bukkit.org/content/groups/public</url>
+        </repository>
+    </repositories>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>1.4.6-R0.3-SNAPSHOT</version>
+            <type>jar</type>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/src/main/java/jadedwolf/plugins/nofarm/NoFarm.java b/src/main/java/jadedwolf/plugins/nofarm/NoFarm.java
@@ -7,42 +7,43 @@
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class NoFarm extends JavaPlugin {
-	static final Logger log = Logger.getLogger("Minecraft");
-	private final NoFarmEntityListener entityListener = new NoFarmEntityListener(
-			this);
-	private final NoFarmMobListener mobListener = new NoFarmMobListener(
-			this);
-	@Override
-	public void onDisable() {
-		PluginDescriptionFile plugin = getDescription();
-		System.out.println(plugin.getName() + " version " + plugin.getVersion()
-				+ " is now Disabled");
-	}
-
-	@Override
-	public void onEnable() {
-
-		// Load configuration
-		FileConfigurationOptions cfgOptions = getConfig().options();
-		cfgOptions.copyDefaults(true);
-		cfgOptions.copyHeader(true);
-		saveConfig();
-
-                PluginManager pm = getServer().getPluginManager();
-
-                if (getConfig().getBoolean("NonPlayerDamageDropsItems", true)) {
-		getServer().getPluginManager().registerEvents(this.entityListener, this);
-                }
-                if (getConfig().getBoolean("MobsDoNotTakeFallDamage", true)) {
-		getServer().getPluginManager().registerEvents(this.mobListener, this);
-                }
-
-		PluginDescriptionFile plugin = getDescription();
-		System.out.println(plugin.getName() + " version " + plugin.getVersion()
-				+ " by mbcraft.com is now enabled.");
-
-
-
-	}
 
+    static final Logger log = Logger.getLogger("Minecraft");
+    private final NoFarmEntityListener entityListener = new NoFarmEntityListener(
+            this);
+    private final NoFarmMobListener mobListener = new NoFarmMobListener(
+            this);
+
+    @Override
+    public void onDisable() {
+        PluginDescriptionFile plugin = getDescription();
+        System.out.println(plugin.getName() + " version " + plugin.getVersion()
+                + " is now Disabled");
+    }
+
+    @Override
+    public void onEnable() {
+
+        // Load configuration
+        FileConfigurationOptions cfgOptions = getConfig().options();
+        cfgOptions.copyDefaults(true);
+        cfgOptions.copyHeader(true);
+        saveConfig();
+
+        PluginManager pm = getServer().getPluginManager();
+
+        if (getConfig().getBoolean("NonPlayerDamageDropsItems", true)) {
+            getServer().getPluginManager().registerEvents(this.entityListener, this);
+        }
+        if (getConfig().getBoolean("MobsDoNotTakeFallDamage", true)) {
+            getServer().getPluginManager().registerEvents(this.mobListener, this);
+        }
+
+        PluginDescriptionFile plugin = getDescription();
+        System.out.println(plugin.getName() + " version " + plugin.getVersion()
+                + " by mbcraft.com is now enabled.");
+
+
+
+    }
 }
diff --git a/src/main/java/jadedwolf/plugins/nofarm/NoFarmEntityListener.java b/src/main/java/jadedwolf/plugins/nofarm/NoFarmEntityListener.java
@@ -1,25 +1,21 @@
 package jadedwolf.plugins.nofarm;
 
-import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.Listener;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.entity.EntityDamageEvent;
-
-
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDeathEvent;
 
 public class NoFarmEntityListener implements Listener {
 
-	public NoFarmEntityListener(NoFarm instance) {
-	}
+    public NoFarmEntityListener(NoFarm instance) {
+    }
 
-  @EventHandler
-  public void onEntityDeath(EntityDeathEvent event) {
-    if(!(event.getEntity() instanceof Player) && !(event.getEntity().getLastDamageCause() instanceof EntityDamageByEntityEvent)) {
-        event.setDroppedExp(0);
-        event.getDrops().clear();
+    @EventHandler
+    public void onEntityDeath(EntityDeathEvent event) {
+        if (!(event.getEntity() instanceof Player) && !(event.getEntity().getLastDamageCause() instanceof EntityDamageByEntityEvent)) {
+            event.setDroppedExp(0);
+            event.getDrops().clear();
         }
-  }
+    }
 }
diff --git a/src/main/java/jadedwolf/plugins/nofarm/NoFarmMobListener.java b/src/main/java/jadedwolf/plugins/nofarm/NoFarmMobListener.java
@@ -2,8 +2,8 @@
 
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
-import org.bukkit.event.Listener;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageEvent;
 
 public class NoFarmMobListener implements Listener {