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/EntitySlime.java 2014-11-28 17:43:43.157707434 +0000
+++ src/main/java/net/minecraft/server/EntitySlime.java 2014-11-28 17:38:18.000000000 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/EntitySlime.java 2015-02-26 22:40:22.687608138 +0000
+++ src/main/java/net/minecraft/server/EntitySlime.java 2015-02-26 22:40:22.691608138 +0000
@@ -1,5 +1,9 @@
package net.minecraft.server;
@@ -10,11 +10,19 @@
public class EntitySlime extends EntityInsentient implements IMonster {
public float a;
@@ -132,6 +136,18 @@
@@ -23,7 +27,7 @@
this.datawatcher.a(16, Byte.valueOf((byte) 1));
}
if (!this.world.isStatic && i > 1 && this.getHealth() <= 0.0F) {
- protected void setSize(int i) {
+ public void setSize(int i) { // CraftBukkit - public
this.datawatcher.watch(16, Byte.valueOf((byte) i));
this.setSize(0.51000005F * (float) i, 0.51000005F * (float) i);
this.setPosition(this.locX, this.locY, this.locZ);
@@ -133,6 +137,18 @@
if (!this.world.isClientSide && i > 1 && this.getHealth() <= 0.0F) {
int j = 2 + this.random.nextInt(3);
+
+ // CraftBukkit start
+ SlimeSplitEvent event = new SlimeSplitEvent((org.bukkit.entity.Slime) this.getBukkitEntity(), j);
+ this.world.getServer().getPluginManager().callEvent(event);
@@ -26,9 +34,10 @@
+ return;
+ }
+ // CraftBukkit end
+
for (int k = 0; k < j; ++k) {
float f = ((float) (k % 2) - 0.5F) * (float) i / 4.0F;
float f1 = ((float) (k / 2) - 0.5F) * (float) i / 4.0F;
@@ -148,7 +164,7 @@
entityslime.setSize(i / 2);