pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bukkit</groupId>
     <artifactId>bukkit</artifactId>
-    <version>1.6.4-R2.1-SNAPSHOT</version>
+    <version>1.6.4-R0.1-SNAPSHOT</version>
     <name>Bukkit</name>
     <url>http://www.bukkit.org</url>
 
@@ -43,10 +43,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
+                <version>2.0.2</version>
                 <configuration>
                     <source>1.6</source>
                     <target>1.6</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
                 </configuration>
             </plugin>
             <plugin>

src/main/java/org/bukkit/Location.java

@@ -334,7 +334,7 @@ public class Location implements Cloneable {
      * @return the magnitude
      */
     public double length() {
-        return Math.sqrt(NumberConversions.square(x) + NumberConversions.square(y) + NumberConversions.square(z));
+        return Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2));
     }
 
     /**
@@ -345,7 +345,7 @@ public class Location implements Cloneable {
      * @return the magnitude
      */
     public double lengthSquared() {
-        return NumberConversions.square(x) + NumberConversions.square(y) + NumberConversions.square(z);
+        return Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2);
     }
 
     /**
@@ -381,7 +381,7 @@ public class Location implements Cloneable {
             throw new IllegalArgumentException("Cannot measure distance between " + getWorld().getName() + " and " + o.getWorld().getName());
         }
 
-        return NumberConversions.square(x - o.x) + NumberConversions.square(y - o.y) + NumberConversions.square(z - o.z);
+        return Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2) + Math.pow(z - o.z, 2);
     }
 
     /**

src/main/java/org/bukkit/command/Command.java

@@ -345,7 +345,7 @@ public abstract class Command {
         }
 
         Set<Permissible> users = Bukkit.getPluginManager().getPermissionSubscriptions(Server.BROADCAST_CHANNEL_ADMINISTRATIVE);
-        String colored = ChatColor.GRAY + "" + ChatColor.ITALIC + "[" + result + ChatColor.GRAY + ChatColor.ITALIC + "]";
+        String colored = ChatColor.GRAY + "" + ChatColor.ITALIC + "[" + result + "]";
 
         if (sendToSource && !(source instanceof ConsoleCommandSender)) {
             source.sendMessage(message);

src/main/java/org/bukkit/command/defaults/EffectCommand.java

@@ -100,7 +100,7 @@ public class EffectCommand extends VanillaCommand {
             final PotionEffect applyEffect = new PotionEffect(effect, duration, amplification);
 
             player.addPotionEffect(applyEffect, true);
-            broadcastCommandMessage(sender, String.format("Given %s (ID %d) * %d to %s for %d seconds", effect.getName(), effect.getId(), amplification, args[0], duration_temp));
+            broadcastCommandMessage(sender, String.format("Given %s (ID %d) * %d to %s for %d seconds", effect.getName(), effect.getId(), amplification, args[0], duration));
         }
 
         return true;

src/main/java/org/bukkit/util/NumberConversions.java

@@ -20,10 +20,6 @@ public final class NumberConversions {
         return floor(num + 0.5d);
     }
 
-    public static double square(double num) {
-        return num * num;
-    }
-
     public static int toInt(Object object) {
         if (object instanceof Number) {
             return ((Number) object).intValue();

src/main/java/org/bukkit/util/Vector.java

@@ -152,7 +152,7 @@ public class Vector implements Cloneable, ConfigurationSerializable {
      * @return the magnitude
      */
     public double length() {
-        return Math.sqrt(NumberConversions.square(x) + NumberConversions.square(y) + NumberConversions.square(z));
+        return Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2));
     }
 
     /**
@@ -161,7 +161,7 @@ public class Vector implements Cloneable, ConfigurationSerializable {
      * @return the magnitude
      */
     public double lengthSquared() {
-        return NumberConversions.square(x) + NumberConversions.square(y) + NumberConversions.square(z);
+        return Math.pow(x, 2) + Math.pow(y, 2) + Math.pow(z, 2);
     }
 
     /**
@@ -175,7 +175,7 @@ public class Vector implements Cloneable, ConfigurationSerializable {
      * @return the distance
      */
     public double distance(Vector o) {
-        return Math.sqrt(NumberConversions.square(x - o.x) + NumberConversions.square(y - o.y) + NumberConversions.square(z - o.z));
+        return Math.sqrt(Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2) + Math.pow(z - o.z, 2));
     }
 
     /**
@@ -185,7 +185,7 @@ public class Vector implements Cloneable, ConfigurationSerializable {
      * @return the distance
      */
     public double distanceSquared(Vector o) {
-        return NumberConversions.square(x - o.x) + NumberConversions.square(y - o.y) + NumberConversions.square(z - o.z);
+        return Math.pow(x - o.x, 2) + Math.pow(y - o.y, 2) + Math.pow(z - o.z, 2);
     }
 
     /**
@@ -346,7 +346,7 @@ public class Vector implements Cloneable, ConfigurationSerializable {
      * @return whether this vector is in the sphere
      */
     public boolean isInSphere(Vector origin, double radius) {
-        return (NumberConversions.square(origin.x - x) + NumberConversions.square(origin.y - y) + NumberConversions.square(origin.z - z)) <= NumberConversions.square(radius);
+        return (Math.pow(origin.x - x, 2) + Math.pow(origin.y - y, 2) + Math.pow(origin.z - z, 2)) <= Math.pow(radius, 2);
     }
 
     /**