Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-18 01:41:13 +02:00
Code Issues Projects Releases Wiki Activity

Move persist flag check

Browse Source
This commit is contained in:
md_5 2018-07-30 13:25:02 +10:00
parent 98f4292331
commit 3f9d7f7770
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nms-patches/Entity.patch
View File

@ -289,15 +289,16 @@
this.world = world;
}
@@ -1311,13 +1499,25 @@
}
@@ -1301,7 +1489,7 @@
public boolean c(NBTTagCompound nbttagcompound) {
String s = this.getSaveID();
public boolean d(NBTTagCompound nbttagcompound) {
- return this.isPassenger() ? false : this.c(nbttagcompound);
+ return !this.persist || this.isPassenger() ? false : this.c(nbttagcompound); // CraftBukkit - persist flag
}
public NBTTagCompound save(NBTTagCompound nbttagcompound) {
- if (!this.dead && s != null) {
+ if (this.persist && !this.dead && s != null) { // CraftBukkit - persist flag
nbttagcompound.setString("id", s);
this.save(nbttagcompound);
return true;
@@ -1318,6 +1506,18 @@
try {
nbttagcompound.set("Pos", this.a(new double[] { this.locX, this.locY, this.locZ}));
nbttagcompound.set("Motion", this.a(new double[] { this.motX, this.motY, this.motZ}));