Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 03:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Fix fireballs being motionless (again). Fixes BUKKIT-3299

Browse Source 
The key "direction" incorrectly mapped to variables that were already
set in the entity. In order to prevent loading incorrect data we
renamed "direction" to "power."
This commit is contained in:
feildmaster 2012-12-25 05:42:04 -06:00
parent 155b83e2c7
commit 3a0c5aff0c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/minecraft/server/EntityFireball.java
View File

@ -199,7 +199,8 @@ public abstract class EntityFireball extends Entity {
nbttagcompound.setShort("zTile", (short) this.g); nbttagcompound.setShort("zTile", (short) this.g);
nbttagcompound.setByte("inTile", (byte) this.h); nbttagcompound.setByte("inTile", (byte) this.h);
nbttagcompound.setByte("inGround", (byte) (this.i ? 1 : 0)); nbttagcompound.setByte("inGround", (byte) (this.i ? 1 : 0));
nbttagcompound.set("direction", this.a(new double[] { this.motX, this.motY, this.motZ})); // CraftBukkit - Fix direction being mismapped to invalid variables
nbttagcompound.set("power", this.a(new double[] { this.dirX, this.dirY, this.dirZ}));
} }
public void a(NBTTagCompound nbttagcompound) { public void a(NBTTagCompound nbttagcompound) {
@ -208,12 +209,14 @@ public abstract class EntityFireball extends Entity {
this.g = nbttagcompound.getShort("zTile"); this.g = nbttagcompound.getShort("zTile");
this.h = nbttagcompound.getByte("inTile") & 255; this.h = nbttagcompound.getByte("inTile") & 255;
this.i = nbttagcompound.getByte("inGround") == 1; this.i = nbttagcompound.getByte("inGround") == 1;
if (nbttagcompound.hasKey("direction")) { // CraftBukkit - direction -> power
NBTTagList nbttaglist = nbttagcompound.getList("direction"); if (nbttagcompound.hasKey("power")) {
NBTTagList nbttaglist = nbttagcompound.getList("power");
this.motX = ((NBTTagDouble) nbttaglist.get(0)).data; this.dirX = ((NBTTagDouble) nbttaglist.get(0)).data;
this.motY = ((NBTTagDouble) nbttaglist.get(1)).data; this.dirY = ((NBTTagDouble) nbttaglist.get(1)).data;
this.motZ = ((NBTTagDouble) nbttaglist.get(2)).data; this.dirZ = ((NBTTagDouble) nbttaglist.get(2)).data;
// CraftBukkit end
} else { } else {
this.die(); this.die();
} }