Update to 1.6.4

nicecube · Sep 20, 2013 · 93813d6 · 93813d6
1 parent fb7d864
commit 93813d6
Show file tree

Hide file tree

Showing 215 changed files with 1,947 additions and 1,061 deletions.
diff --git a/net/minecraft/server/BanList.java b/net/minecraft/server/BanList.java
@@ -105,7 +105,7 @@ public void save(boolean flag) {
             PrintWriter printwriter = new PrintWriter(new FileWriter(this.b, false));
 
             if (flag) {
-                printwriter.println("# Updated " + (new SimpleDateFormat()).format(new Date()) + " by Minecraft " + "1.6.2");
+                printwriter.println("# Updated " + (new SimpleDateFormat()).format(new Date()) + " by Minecraft " + "1.6.4");
                 printwriter.println("# victim name | ban date | banned by | banned until | reason");
                 printwriter.println();
             }

diff --git a/net/minecraft/server/BiomeMeta.java b/net/minecraft/server/BiomeMeta.java
@@ -12,4 +12,8 @@ public BiomeMeta(Class oclass, int i, int j, int k) {
         this.c = j;
         this.d = k;
     }
+
+    public String toString() {
+        return this.b.getSimpleName() + "*(" + this.c + "-" + this.d + "):" + this.a;
+    }
 }
diff --git a/net/minecraft/server/BlockDeadBush.java b/net/minecraft/server/BlockDeadBush.java
@@ -20,7 +20,7 @@ public int getDropType(int i, Random random, int j) {
     }
 
     public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) {
-        if (!world.isStatic && entityhuman.bx() != null && entityhuman.bx().id == Item.SHEARS.id) {
+        if (!world.isStatic && entityhuman.by() != null && entityhuman.by().id == Item.SHEARS.id) {
             entityhuman.a(StatisticList.C[this.id], 1);
             this.b(world, i, j, k, new ItemStack(Block.DEAD_BUSH, 1, l));
         } else {

diff --git a/net/minecraft/server/BlockFire.java b/net/minecraft/server/BlockFire.java
@@ -73,7 +73,7 @@ public void a(World world, int i, int j, int k, Random random) {
                 world.setAir(i, j, k);
             }
 
-            if (!flag && world.Q() && (world.F(i, j, k) || world.F(i - 1, j, k) || world.F(i + 1, j, k) || world.F(i, j, k - 1) || world.F(i, j, k + 1))) {
+            if (!flag && world.Q() && (world.isRainingAt(i, j, k) || world.isRainingAt(i - 1, j, k) || world.isRainingAt(i + 1, j, k) || world.isRainingAt(i, j, k - 1) || world.isRainingAt(i, j, k + 1))) {
                 world.setAir(i, j, k);
             } else {
                 int l = world.getData(i, j, k);
@@ -123,7 +123,7 @@ public void a(World world, int i, int j, int k, Random random) {
                                             j2 /= 2;
                                         }
 
-                                        if (j2 > 0 && random.nextInt(l1) <= j2 && (!world.Q() || !world.F(i1, k1, j1)) && !world.F(i1 - 1, k1, k) && !world.F(i1 + 1, k1, j1) && !world.F(i1, k1, j1 - 1) && !world.F(i1, k1, j1 + 1)) {
+                                        if (j2 > 0 && random.nextInt(l1) <= j2 && (!world.Q() || !world.isRainingAt(i1, k1, j1)) && !world.isRainingAt(i1 - 1, k1, k) && !world.isRainingAt(i1 + 1, k1, j1) && !world.isRainingAt(i1, k1, j1 - 1) && !world.isRainingAt(i1, k1, j1 + 1)) {
                                             int k2 = l + random.nextInt(5) / 4;
 
                                             if (k2 > 15) {
@@ -152,7 +152,7 @@ private void a(World world, int i, int j, int k, int l, Random random, int i1) {
         if (random.nextInt(l) < j1) {
             boolean flag = world.getTypeId(i, j, k) == Block.TNT.id;
 
-            if (random.nextInt(i1 + 10) < 5 && !world.F(i, j, k)) {
+            if (random.nextInt(i1 + 10) < 5 && !world.isRainingAt(i, j, k)) {
                 int k1 = i1 + random.nextInt(5) / 4;
 
                 if (k1 > 15) {

diff --git a/net/minecraft/server/BlockLeaves.java b/net/minecraft/server/BlockLeaves.java
@@ -167,7 +167,7 @@ public void dropNaturally(World world, int i, int j, int k, int l, float f, int
     }
 
     public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) {
-        if (!world.isStatic && entityhuman.bx() != null && entityhuman.bx().id == Item.SHEARS.id) {
+        if (!world.isStatic && entityhuman.by() != null && entityhuman.by().id == Item.SHEARS.id) {
             entityhuman.a(StatisticList.C[this.id], 1);
             this.b(world, i, j, k, new ItemStack(Block.LEAVES.id, 1, l & 3));
         } else {

diff --git a/net/minecraft/server/BlockLongGrass.java b/net/minecraft/server/BlockLongGrass.java
@@ -22,7 +22,7 @@ public int getDropCount(int i, Random random) {
     }
 
     public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) {
-        if (!world.isStatic && entityhuman.bx() != null && entityhuman.bx().id == Item.SHEARS.id) {
+        if (!world.isStatic && entityhuman.by() != null && entityhuman.by().id == Item.SHEARS.id) {
             entityhuman.a(StatisticList.C[this.id], 1);
             this.b(world, i, j, k, new ItemStack(Block.LONG_GRASS, 1, l));
         } else {

diff --git a/net/minecraft/server/BlockPortal.java b/net/minecraft/server/BlockPortal.java
@@ -22,7 +22,7 @@ public void a(World world, int i, int j, int k, Random random) {
                 Entity entity = ItemMonsterEgg.a(world, 57, (double) i + 0.5D, (double) l + 1.1D, (double) k + 0.5D);
 
                 if (entity != null) {
-                    entity.portalCooldown = entity.ab();
+                    entity.portalCooldown = entity.ac();
                 }
             }
         }
@@ -153,7 +153,7 @@ public int a(Random random) {
 
     public void a(World world, int i, int j, int k, Entity entity) {
         if (entity.vehicle == null && entity.passenger == null) {
-            entity.aa();
+            entity.ab();
         }
     }
 }
diff --git a/net/minecraft/server/BlockPressurePlateBinary.java b/net/minecraft/server/BlockPressurePlateBinary.java
@@ -41,7 +41,7 @@ protected int e(World world, int i, int j, int k) {
             while (iterator.hasNext()) {
                 Entity entity = (Entity) iterator.next();
 
-                if (!entity.at()) {
+                if (!entity.au()) {
                     return 15;
                 }
             }

diff --git a/net/minecraft/server/BlockSoil.java b/net/minecraft/server/BlockSoil.java
@@ -24,7 +24,7 @@ public boolean b() {
     }
 
     public void a(World world, int i, int j, int k, Random random) {
-        if (!this.m(world, i, j, k) && !world.F(i, j + 1, k)) {
+        if (!this.m(world, i, j, k) && !world.isRainingAt(i, j + 1, k)) {
             int l = world.getData(i, j, k);
 
             if (l > 0) {

diff --git a/net/minecraft/server/BlockTNT.java b/net/minecraft/server/BlockTNT.java
@@ -53,10 +53,10 @@ public void a(World world, int i, int j, int k, int l, EntityLiving entityliving
     }
 
     public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman, int l, float f, float f1, float f2) {
-        if (entityhuman.bx() != null && entityhuman.bx().id == Item.FLINT_AND_STEEL.id) {
+        if (entityhuman.by() != null && entityhuman.by().id == Item.FLINT_AND_STEEL.id) {
             this.a(world, i, j, k, 1, entityhuman);
             world.setAir(i, j, k);
-            entityhuman.bx().damage(1, entityhuman);
+            entityhuman.by().damage(1, entityhuman);
             return true;
         } else {
             return super.interact(world, i, j, k, entityhuman, l, f, f1, f2);

diff --git a/net/minecraft/server/BlockTripwire.java b/net/minecraft/server/BlockTripwire.java
@@ -74,7 +74,7 @@ public void remove(World world, int i, int j, int k, int l, int i1) {
 
     public void a(World world, int i, int j, int k, int l, EntityHuman entityhuman) {
         if (!world.isStatic) {
-            if (entityhuman.bx() != null && entityhuman.bx().id == Item.SHEARS.id) {
+            if (entityhuman.by() != null && entityhuman.by().id == Item.SHEARS.id) {
                 world.setData(i, j, k, l | 8, 4);
             }
         }
@@ -138,7 +138,7 @@ private void k(World world, int i, int j, int k) {
             while (iterator.hasNext()) {
                 Entity entity = (Entity) iterator.next();
 
-                if (!entity.at()) {
+                if (!entity.au()) {
                     flag1 = true;
                     break;
                 }

diff --git a/net/minecraft/server/BlockVine.java b/net/minecraft/server/BlockVine.java
@@ -284,7 +284,7 @@ public int a(Random random) {
     }
 
     public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l) {
-        if (!world.isStatic && entityhuman.bx() != null && entityhuman.bx().id == Item.SHEARS.id) {
+        if (!world.isStatic && entityhuman.by() != null && entityhuman.by().id == Item.SHEARS.id) {
             entityhuman.a(StatisticList.C[this.id], 1);
             this.b(world, i, j, k, new ItemStack(Block.VINE, 1, 0));
         } else {

diff --git a/net/minecraft/server/BlockWeb.java b/net/minecraft/server/BlockWeb.java
@@ -10,7 +10,7 @@ public BlockWeb(int i) {
     }
 
     public void a(World world, int i, int j, int k, Entity entity) {
-        entity.al();
+        entity.am();
     }
 
     public boolean c() {

diff --git a/net/minecraft/server/Chunk.java b/net/minecraft/server/Chunk.java
@@ -630,7 +630,7 @@ public void addEntities() {
             while (iterator.hasNext()) {
                 Entity entity = (Entity) iterator.next();
 
-                entity.Q();
+                entity.R();
             }
 
             this.world.a(this.entitySlices[i]);
@@ -678,7 +678,7 @@ public void a(Entity entity, AxisAlignedBB axisalignedbb, List list, IEntitySele
 
                 if (entity1 != entity && entity1.boundingBox.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {
                     list.add(entity1);
-                    Entity[] aentity = entity1.an();
+                    Entity[] aentity = entity1.ao();
 
                     if (aentity != null) {
                         for (int i1 = 0; i1 < aentity.length; ++i1) {

diff --git a/net/minecraft/server/ChunkProviderGenerate.java b/net/minecraft/server/ChunkProviderGenerate.java
@@ -422,7 +422,7 @@ public String getName() {
     public List getMobsFor(EnumCreatureType enumcreaturetype, int i, int j, int k) {
         BiomeBase biomebase = this.p.getBiome(i, k);
 
-        return biomebase == null ? null : (biomebase == BiomeBase.SWAMPLAND && enumcreaturetype == EnumCreatureType.MONSTER && this.x.a(i, j, k) ? this.x.a() : biomebase.getMobs(enumcreaturetype));
+        return biomebase == null ? null : (enumcreaturetype == EnumCreatureType.MONSTER && this.x.a(i, j, k) ? this.x.b() : biomebase.getMobs(enumcreaturetype));
     }
 
     public ChunkPosition findNearestMapFeature(World world, String s, int i, int j, int k) {

diff --git a/net/minecraft/server/ChunkProviderHell.java b/net/minecraft/server/ChunkProviderHell.java
@@ -421,12 +421,12 @@ public String getName() {
 
     public List getMobsFor(EnumCreatureType enumcreaturetype, int i, int j, int k) {
         if (enumcreaturetype == EnumCreatureType.MONSTER) {
-            if (this.c.a(i, j, k)) {
-                return this.c.a();
+            if (this.c.b(i, j, k)) {
+                return this.c.b();
             }
 
-            if (this.c.b(i, j, k) && this.o.getTypeId(i, j - 1, k) == Block.NETHER_BRICK.id) {
-                return this.c.a();
+            if (this.c.d(i, j, k) && this.o.getTypeId(i, j - 1, k) == Block.NETHER_BRICK.id) {
+                return this.c.b();
             }
         }
 

diff --git a/net/minecraft/server/CombatTracker.java b/net/minecraft/server/CombatTracker.java
@@ -27,7 +27,7 @@ public void a() {
             } else if (i == Block.VINE.id) {
                 this.f = "vines";
             }
-        } else if (this.b.G()) {
+        } else if (this.b.H()) {
             this.f = "water";
         }
     }
@@ -59,15 +59,15 @@ public ChatMessage b() {
                 if (combatentry.a() != DamageSource.FALL && combatentry.a() != DamageSource.OUT_OF_WORLD) {
                     if (s1 != null && (s == null || !s1.equals(s))) {
                         Entity entity1 = combatentry.a().getEntity();
-                        ItemStack itemstack = entity1 instanceof EntityLiving ? ((EntityLiving) entity1).aY() : null;
+                        ItemStack itemstack = entity1 instanceof EntityLiving ? ((EntityLiving) entity1).aZ() : null;
 
                         if (itemstack != null && itemstack.hasName()) {
                             chatmessage = ChatMessage.b("death.fell.assist.item", new Object[] { this.b.getScoreboardDisplayName(), s1, itemstack.getName()});
                         } else {
                             chatmessage = ChatMessage.b("death.fell.assist", new Object[] { this.b.getScoreboardDisplayName(), s1});
                         }
                     } else if (s != null) {
-                        ItemStack itemstack1 = entity instanceof EntityLiving ? ((EntityLiving) entity).aY() : null;
+                        ItemStack itemstack1 = entity instanceof EntityLiving ? ((EntityLiving) entity).aZ() : null;
 
                         if (itemstack1 != null && itemstack1.hasName()) {
                             chatmessage = ChatMessage.b("death.fell.finish.item", new Object[] { this.b.getScoreboardDisplayName(), s, itemstack1.getName()});

diff --git a/net/minecraft/server/CommandDispatcher.java b/net/minecraft/server/CommandDispatcher.java
@@ -45,6 +45,7 @@ public CommandDispatcher() {
             this.a(new CommandKick());
             this.a(new CommandList());
             this.a(new CommandWhitelist());
+            this.a(new CommandIdleTimeout());
         } else {
             this.a(new CommandPublish());
         }

diff --git a/net/minecraft/server/CommandEffect.java b/net/minecraft/server/CommandEffect.java
@@ -29,7 +29,7 @@ public void b(ICommandListener icommandlistener, String[] astring) {
                     throw new CommandException("commands.effect.failure.notActive.all", new Object[] { entityplayer.getLocalizedName()});
                 }
 
-                entityplayer.aJ();
+                entityplayer.aK();
                 a(icommandlistener, "commands.effect.success.removed.all", new Object[] { entityplayer.getLocalizedName()});
             } else {
                 int i = a(icommandlistener, astring[1], 1);

diff --git a/net/minecraft/server/CommandEnchant.java b/net/minecraft/server/CommandEnchant.java
@@ -25,7 +25,7 @@ public void b(ICommandListener icommandlistener, String[] astring) {
             EntityPlayer entityplayer = d(icommandlistener, astring[0]);
             int i = a(icommandlistener, astring[1], 0, Enchantment.byId.length - 1);
             int j = 1;
-            ItemStack itemstack = entityplayer.bx();
+            ItemStack itemstack = entityplayer.by();
 
             if (itemstack == null) {
                 throw new CommandException("commands.enchant.noItem", new Object[0]);

diff --git a/net/minecraft/server/CommandIdleTimeout.java b/net/minecraft/server/CommandIdleTimeout.java
@@ -0,0 +1,29 @@
+package net.minecraft.server;
+
+public class CommandIdleTimeout extends CommandAbstract {
+
+    public CommandIdleTimeout() {}
+
+    public String c() {
+        return "setidletimeout";
+    }
+
+    public int a() {
+        return 3;
+    }
+
+    public String c(ICommandListener icommandlistener) {
+        return "commands.setidletimeout.usage";
+    }
+
+    public void b(ICommandListener icommandlistener, String[] astring) {
+        if (astring.length == 1) {
+            int i = a(icommandlistener, astring[0], 0);
+
+            MinecraftServer.getServer().e(i);
+            a(icommandlistener, "commands.setidletimeout.success", new Object[] { Integer.valueOf(i)});
+        } else {
+            throw new ExceptionUsage("commands.setidletimeout.usage", new Object[0]);
+        }
+    }
+}
diff --git a/net/minecraft/server/CrashReportVersion.java b/net/minecraft/server/CrashReportVersion.java
@@ -11,7 +11,7 @@ class CrashReportVersion implements Callable {
     }
 
     public String a() {
-        return "1.6.2";
+        return "1.6.4";
     }
 
     public Object call() {

diff --git a/net/minecraft/server/DamageSource.java b/net/minecraft/server/DamageSource.java
@@ -117,7 +117,7 @@ protected DamageSource l() {
     }
 
     public ChatMessage getLocalizedDeathMessage(EntityLiving entityliving) {
-        EntityLiving entityliving1 = entityliving.aR();
+        EntityLiving entityliving1 = entityliving.aS();
         String s = "death.attack." + this.translationIndex;
         String s1 = s + ".player";