Update to Minecraft 1.8.3

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-26 22:41:06 +00:00
parent d789ce91d4
commit 85be409b13
347 changed files with 5027 additions and 5465 deletions

View File

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/TileEntityBeacon.java 2014-12-27 14:58:26.269254675 +0000
+++ src/main/java/net/minecraft/server/TileEntityBeacon.java 2014-12-27 14:58:26.269254675 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/TileEntityBeacon.java 2015-02-26 22:40:23.119608134 +0000
+++ src/main/java/net/minecraft/server/TileEntityBeacon.java 2015-02-26 22:40:23.119608134 +0000
@@ -5,6 +5,11 @@
import java.util.Iterator;
import java.util.List;
@@ -54,31 +54,31 @@
this.j = nbttagcompound.getInt("Levels");
}
@@ -182,7 +211,7 @@
@@ -236,7 +265,7 @@
}
public int getSize() {
public int getMaxStackSize() {
- return 1;
+ return maxStack; // CraftBukkit
}
public ItemStack getItem(int i) {
public boolean a(EntityHuman entityhuman) {
@@ -282,11 +311,11 @@
break;
case 1:
- this.k = j;
+ this.k = validateEffect(j); // CraftBukkit
+ this.k = validateEffect(j);
break;
case 2:
- this.l = j;
+ this.l = validateEffect(j); // CraftBukkit
+ this.l = validateEffect(j);
}
}
@@ -307,4 +336,23 @@
return super.c(i, j);
@@ -326,4 +355,23 @@
return this.a;
}
}
+
@@ -93,7 +93,7 @@
+ case 5: // MobEffectList.INCREASE_DAMAGE.id
+ case 10: // MobEffectList.REGENERATION.id
+ break;
+ default:
+ default:
+ i = 0;
+ break;
+ }