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,6 +1,6 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityExperienceOrb.java 2014-11-28 17:43:43.089707435 +0000
+++ src/main/java/net/minecraft/server/EntityExperienceOrb.java 2014-11-28 17:38:20.000000000 +0000
@@ -1,5 +1,11 @@
--- /home/matt/mc-dev-private//net/minecraft/server/EntityExperienceOrb.java 2015-02-26 22:40:22.527608140 +0000
+++ src/main/java/net/minecraft/server/EntityExperienceOrb.java 2015-02-26 22:40:22.527608140 +0000
@@ -1,12 +1,18 @@
package net.minecraft.server;
+// CraftBukkit start
@@ -12,10 +12,18 @@
public class EntityExperienceOrb extends Entity {
public int a;
public int b;
public int c;
private int d = 5;
- private int value;
+ public int value; // CraftBukkit - public
private EntityHuman targetPlayer;
private int targetTime;
@@ -34,6 +40,7 @@
public void s_() {
super.s_();
public void t_() {
super.t_();
+ EntityHuman prevTarget = this.targetPlayer;// CraftBukkit - store old target
if (this.c > 0) {
--this.c;
@@ -47,7 +55,7 @@
this.move(this.motX, this.motY, this.motZ);
@@ -141,7 +160,7 @@
entityhuman.bn = 2;
entityhuman.bp = 2;
this.world.makeSound(entityhuman, "random.orb", 0.1F, 0.5F * ((this.random.nextFloat() - this.random.nextFloat()) * 0.7F + 1.8F));
entityhuman.receive(this, 1);
- entityhuman.giveExp(this.value);