Implemented BlockState.update(boolean), signs should now work, cleaned up some code a little

1 files changed, 67 insertions, 67 deletions

diff --git a/src/main/java/net/minecraft/server/EntityMinecart.java b/src/main/java/net/minecraft/server/EntityMinecart.java
index 5b5437f0..cb54f5fe 100644
--- a/src/main/java/net/minecraft/server/EntityMinecart.java
+++ b/src/main/java/net/minecraft/server/EntityMinecart.java
@@ -2,8 +2,8 @@ package net.minecraft.server;
 
 import java.util.List;
 
-import org.bukkit.Location;

-import org.bukkit.Vector;

+import org.bukkit.Location;
+import org.bukkit.Vector;
 import org.bukkit.craftbukkit.CraftEntity;
 import org.bukkit.craftbukkit.CraftMappable;
 import org.bukkit.craftbukkit.CraftMinecart;
@@ -14,7 +14,7 @@ import org.bukkit.event.vehicle.*;
 public class EntityMinecart extends Entity
         implements IInventory, CraftMappable {
 
-    private CraftMinecart minecart;

+    private CraftMinecart minecart;
     
     private ItemStack ak[];
     public int a;
@@ -94,18 +94,18 @@ public class EntityMinecart extends Entity
     private double aq;
     private double ar;
     private double as;
-    

-    private boolean slowWhenEmpty = true;

-    private double derailedX = 0.5;

-    private double derailedY = 0.5;

-    private double derailedZ = 0.5;

-    private double flyingX = 0.94999998807907104;

-    private double flyingY = 0.94999998807907104;

+    
+    private boolean slowWhenEmpty = true;
+    private double derailedX = 0.5;
+    private double derailedY = 0.5;
+    private double derailedZ = 0.5;
+    private double flyingX = 0.94999998807907104;
+    private double flyingY = 0.94999998807907104;
     private double flyingZ = 0.94999998807907104;
 
     public CraftEntity getCraftEntity() {
         return minecart;
-    }

+    }
 
     public EntityMinecart(World world) {
         super(world);
@@ -120,7 +120,7 @@ public class EntityMinecart extends Entity
         M = false;
         
         // CraftBukkit start
-        handleCreation(world);

+        handleCreation(world);
         // CraftBukkit end
     }
 
@@ -155,19 +155,19 @@ public class EntityMinecart extends Entity
         d = i;
         
         // CraftBukkit start
-        handleCreation(world);

-        // CraftBukkit end

-    }

-

-    // CraftBukkit start

-    private void handleCreation(World world) {

-        CraftServer server = ((WorldServer) world).getServer();

+        handleCreation(world);
+        // CraftBukkit end
+    }
+
+    // CraftBukkit start
+    private void handleCreation(World world) {
+        CraftServer server = ((WorldServer) world).getServer();
         minecart = CraftMinecart.getCraftMinecart(server, this);
-        VehicleCreateEvent event = new VehicleCreateEvent(

-                Type.VEHICLE_CREATE, minecart);

-        server.getPluginManager().callEvent(event);

+        VehicleCreateEvent event = new VehicleCreateEvent(
+                Type.VEHICLE_CREATE, minecart);
+        server.getPluginManager().callEvent(event);
     }
-    // CraftBukkit end

+    // CraftBukkit end
 
     public double j() {
         return (double) J * 0.0D - 0.30000001192092896D;
@@ -176,14 +176,14 @@ public class EntityMinecart extends Entity
     public boolean a(Entity entity, int i) {
         // CraftBukkit start
         VehicleDamageEvent event = new VehicleDamageEvent(
-                Type.VEHICLE_DAMAGE, minecart,

-                ((WorldServer)l).getWorld().toCraftEntity(entity), i);

-        ((WorldServer)l).getServer().getPluginManager().callEvent(event);

+                Type.VEHICLE_DAMAGE, minecart,
+                ((WorldServer)l).getWorld().toCraftEntity(entity), i);
+        ((WorldServer)l).getServer().getPluginManager().callEvent(event);
         
         if (event.isCancelled()) {
             return true;
         }
-        // CraftBukkit end

+        // CraftBukkit end
         
         i = event.getDamage();
         
@@ -246,12 +246,12 @@ public class EntityMinecart extends Entity
     }
 
     public void b_() {
-        double prevX = p;

-        double prevY = q;

-        double prevZ = r;

-        float prevYaw = v;

-        float prevPitch = w;

-        

+        double prevX = p;
+        double prevY = q;
+        double prevZ = r;
+        float prevYaw = v;
+        float prevPitch = w;
+        
         if (b > 0) {
             b--;
         }
@@ -380,7 +380,7 @@ public class EntityMinecart extends Entity
             } else if (ai[1][1] != 0 && MathHelper.b(p) - i == ai[1][0] && MathHelper.b(r) - i1 == ai[1][2]) {
                 a(p, q + (double) ai[1][1], r);
             }
-            if (j != null || !slowWhenEmpty) {

+            if (j != null || !slowWhenEmpty) {
                 s *= 0.99699997901916504D;
                 t *= 0.0D;
                 u *= 0.99699997901916504D;
@@ -459,18 +459,18 @@ public class EntityMinecart extends Entity
                 u = d6;
             }
             if (A) {
-                s *= derailedX;

-                t *= derailedY;

-                u *= derailedZ;

+                s *= derailedX;
+                t *= derailedY;
+                u *= derailedZ;
             }
             c(s, t, u);
             if (!A) {
-                s *= flyingX;

-                t *= flyingY;

-                u *= flyingZ;

+                s *= flyingX;
+                t *= flyingY;
+                u *= flyingZ;
             }
-        }

-        

+        }
+        
         w = 0.0F;
         double d28 = m - p;
         double d29 = o - r;
@@ -637,36 +637,36 @@ public class EntityMinecart extends Entity
         }
 
         // CraftBukkit start
-        CraftServer server = ((WorldServer)l).getServer();

-        VehicleEntityCollisionEvent collsionEvent = new VehicleEntityCollisionEvent(

-                Type.VEHICLE_COLLISION_ENTITY, minecart,

-                ((WorldServer)l).getWorld().toCraftEntity(entity));

-        server.getPluginManager().callEvent(collsionEvent);

+        CraftServer server = ((WorldServer)l).getServer();
+        VehicleEntityCollisionEvent collsionEvent = new VehicleEntityCollisionEvent(
+                Type.VEHICLE_COLLISION_ENTITY, minecart,
+                ((WorldServer)l).getWorld().toCraftEntity(entity));
+        server.getPluginManager().callEvent(collsionEvent);
         
-        if (collsionEvent.isCancelled()) {

-            return;

+        if (collsionEvent.isCancelled()) {
+            return;
+        }
+        // CraftBukkit end
+        
+        if (!collsionEvent.isPickupCancelled()
+                && (entity instanceof EntityLiving) && !(entity instanceof EntityPlayer)
+                && d == 0 && s * s + u * u > 0.01D && j == null && entity.k == null) {
+            // CraftBukkit start
+            VehicleEnterEvent enterEvent = new VehicleEnterEvent(
+                    Type.VEHICLE_ENTER, minecart,
+                    ((WorldServer)l).getWorld().toCraftEntity(entity));
+            server.getPluginManager().callEvent(enterEvent);
+            // CraftBukkit end
+            
+            if (!enterEvent.isCancelled()) {
+                entity.e(this);
+            }
         }
-        // CraftBukkit end

-        

-        if (!collsionEvent.isPickupCancelled()

-                && (entity instanceof EntityLiving) && !(entity instanceof EntityPlayer)

-                && d == 0 && s * s + u * u > 0.01D && j == null && entity.k == null) {

-            // CraftBukkit start

-            VehicleEnterEvent enterEvent = new VehicleEnterEvent(

-                    Type.VEHICLE_ENTER, minecart,

-                    ((WorldServer)l).getWorld().toCraftEntity(entity));

-            server.getPluginManager().callEvent(enterEvent);

-            // CraftBukkit end

-            

-            if (!enterEvent.isCancelled()) {

-                entity.e(this);

-            }

-        }

         double d1 = entity.p - p;
         double d2 = entity.r - r;
         double d3 = d1 * d1 + d2 * d2;
 
-        if (!collsionEvent.isCollisionCancelled() && d3 >= 9.9999997473787516E-005D) {

+        if (!collsionEvent.isCollisionCancelled() && d3 >= 9.9999997473787516E-005D) {
             d3 = MathHelper.a(d3);
             d1 /= d3;
             d2 /= d3;
@@ -760,7 +760,7 @@ public class EntityMinecart extends Entity
 
     public void d() {}
 
-    public boolean a(EntityPlayer entityplayer) {        

+    public boolean a(EntityPlayer entityplayer) {        
         if (d == 0) {
             if (j != null && (j instanceof EntityPlayer) && j != entityplayer) {
                 return true;