Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 10:35:38 +01:00
Code Issues Projects Releases Wiki Activity

[Auto] Updated Upstream (CraftBukkit/Spigot)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
049120068 SPIGOT-6101: Store persist state of entities
0de8365dd SPIGOT-6103: Summoning an Eye of Ender throw an Error

Spigot Changes:
b5a13e6d Rebuild patches
This commit is contained in:
Aikar 2020-08-26 04:46:59 -04:00
parent 655258b339
commit 20fc1b5c2a
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
24 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch
View File

@ -19,7 +19,7 @@ index b8868b86338ce0e89bc74eccccf714b910d7a4fe..9cb2f3b31921870ddba044840e99eb04
MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.chunkX, e.chunkZ);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e14286065d98c84d47b6596cdea5bd43f66c3603..c019a3f4febd819db32ab8917a275eec8d8493b2 100644
index f7ebe8e05613e638dc1dd386f4cf9a48c7b1e2a7..1a29857b41713126e86131b6eac01f0190fa11e7 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -51,7 +51,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@ -31,7 +31,7 @@ index e14286065d98c84d47b6596cdea5bd43f66c3603..c019a3f4febd819db32ab8917a275eec
// CraftBukkit start
private static final int CURRENT_LEVEL = 2;
@@ -1664,12 +1664,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
@@ -1668,12 +1668,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
return true;
}

4
Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch
View File

@ -80,7 +80,7 @@ index 3b3e94cff2c6def318864bb5b7baefcf9de2cae7..6bd9457ad5c9fb1c0f12ff345b531be0
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c019a3f4febd819db32ab8917a275eec8d8493b2..b16e5d7c45db92cea80913a74aee0975024220be 100644
index 1a29857b41713126e86131b6eac01f0190fa11e7..fc6930327625bf951bb0ba21df5eb1a559a2b295 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -175,7 +175,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -92,7 +92,7 @@ index c019a3f4febd819db32ab8917a275eec8d8493b2..b16e5d7c45db92cea80913a74aee0975
}
// CraftBukkit end
@@ -1665,6 +1665,23 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1669,6 +1669,23 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
// Paper start

4
Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
View File

@ -24,10 +24,10 @@ index 8ee2b9bb1bce698fce50ac1b3fc477fcafd0542c..d59b82b7bb1f6d1b231f4e394e0a67a3
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 32e10105fa68b6f647d6c3173ae6e6db03209b78..f38931dec12c09e3822b320855f749158fd784f4 100644
index 66f61f7a9d3770ad1d63aca3a655c8c458845b52..18d60e66b9ebd42ca02142c1d44751881f29fc5d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1755,6 +1755,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1759,6 +1759,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(itemstack, 0.0F);
}

8
Spigot-Server-Patches/0025-Entity-Origin-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 6b4f38c6528a0a730f31eff3204d741e9b4a2ae2..7cfd035d2baa4318c306cd850ea49468ac213792 100644
index da1586b21ee12a28b66410fde09395bc044c26d0..d21106a96356032f1e183c75f020dc61d18d79fd 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -164,6 +164,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -16,7 +16,7 @@ index 6b4f38c6528a0a730f31eff3204d741e9b4a2ae2..7cfd035d2baa4318c306cd850ea49468
// Spigot start
public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
public final boolean defaultActivationState;
@@ -1536,6 +1537,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1539,6 +1540,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.bukkitEntity.storeBukkitValues(nbttagcompound);
}
// CraftBukkit end
@ -28,7 +28,7 @@ index 6b4f38c6528a0a730f31eff3204d741e9b4a2ae2..7cfd035d2baa4318c306cd850ea49468
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
@@ -1652,6 +1658,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1656,6 +1662,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.getBukkitEntity().readBukkitValues(nbttagcompound);
// CraftBukkit end
@ -42,7 +42,7 @@ index 6b4f38c6528a0a730f31eff3204d741e9b4a2ae2..7cfd035d2baa4318c306cd850ea49468
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
@@ -1713,6 +1726,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1717,6 +1730,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
protected abstract void saveData(NBTTagCompound nbttagcompound);

4
Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
View File

@ -21,10 +21,10 @@ index 62e793b71b313146b86b466421e7a5f894bef9df..cd47a4ca069df26969de3051c2aac805
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index acb246076e5b127703c8080a8c5000c8cb05e4ec..ca0b6424379f5470315815e6f3d9731c83125999 100644
index 02b3c1f34f29877d67f4017caa477a332aac8242..c222539ac9f0a2b9f7e4a6ded873db4ca2b2e7b6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2513,7 +2513,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2517,7 +2517,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
double d4 = DimensionManager.a(this.world.getDimensionManager(), worldserver.getDimensionManager());
BlockPosition blockposition = new BlockPosition(MathHelper.a(this.locX() * d4, d0, d2), this.locY(), MathHelper.a(this.locZ() * d4, d1, d3));
// CraftBukkit start

4
Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch
View File

@ -25,10 +25,10 @@ index abbf59bb91021821876a8960e8f77fac24457ec4..04430aae52205ee167662004e45c145b
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ca0b6424379f5470315815e6f3d9731c83125999..263564408d05a231e1857c23d2c15882c4364dd5 100644
index c222539ac9f0a2b9f7e4a6ded873db4ca2b2e7b6..9295f5aa306d062bf95cd10e13796315a1fc8c1d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2188,6 +2188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2192,6 +2192,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@Nullable
public ScoreboardTeamBase getScoreboardTeam() {

4
Spigot-Server-Patches/0101-Optional-TNT-doesn-t-move-in-water.patch
View File

@ -32,10 +32,10 @@ index 05ea87a473228f5b386258fae3943f3f4561eaa6..ac76bdd7e1d91b0d242539c4495948cd
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ef96a77ed1164ce331b65e5ed8c6bbf4350f885e..17cc2b686e33c6de0ab9db6aa7cbc56dac6abcdf 100644
index c51a80f4cbbbe355e332581559b357dc6abe66bf..3b3b443cd25ef5c327f54c5e784e03bd81c73a7a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2660,6 +2660,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2664,6 +2664,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean bU() {

4
Spigot-Server-Patches/0136-Don-t-allow-entities-to-ride-themselves-572.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 17cc2b686e33c6de0ab9db6aa7cbc56dac6abcdf..df77b4e6d5fb3e0ff795ae36402b4c902a613225 100644
index 3b3b443cd25ef5c327f54c5e784e03bd81c73a7a..55b4c8abeb0033b15a255ec36e1998678d836dd2 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1945,6 +1945,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1949,6 +1949,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
protected boolean addPassenger(Entity entity) { // CraftBukkit

6
Spigot-Server-Patches/0156-Entity-fromMobSpawner.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 6684e17974e498108352870c3b5535cc6c8f63c0..720bcc7855162a4578129adc5d4749763baa76fd 100644
index a734de8641a61e6764ca68c194e1bd68142db55e..a3bc9636e7c76751eca496a99e62e3c747908374 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -185,6 +185,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -16,7 +16,7 @@ index 6684e17974e498108352870c3b5535cc6c8f63c0..720bcc7855162a4578129adc5d474976
protected int numCollisions = 0; // Paper
public void inactiveTick() { }
// Spigot end
@@ -1575,6 +1576,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1578,6 +1579,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
if (this.origin != null) {
nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
}
@ -27,7 +27,7 @@ index 6684e17974e498108352870c3b5535cc6c8f63c0..720bcc7855162a4578129adc5d474976
// Paper end
return nbttagcompound;
} catch (Throwable throwable) {
@@ -1697,6 +1702,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1701,6 +1706,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
if (!originTag.isEmpty()) {
origin = new org.bukkit.Location(world.getWorld(), originTag.getDoubleAt(0), originTag.getDoubleAt(1), originTag.getDoubleAt(2));
}

4
Spigot-Server-Patches/0244-add-more-information-to-Entity.toString.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] add more information to Entity.toString()
UUID, ticks lived, valid, dead
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 720bcc7855162a4578129adc5d4749763baa76fd..d62d25af15dee1457df85dbc4db6f7f0a632ecba 100644
index a3bc9636e7c76751eca496a99e62e3c747908374..f5c285909af563b91bb81638a3bcdf9f25584913 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2422,7 +2422,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2426,7 +2426,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public String toString() {

6
Spigot-Server-Patches/0283-Improve-death-events.patch
View File

@ -27,7 +27,7 @@ index 6281f7900afab3ef1c9ba3c034b91cbfa1900f50..7f3401d5d7878e4a0f407e92bf110dbe
int i = this.f ? 300 : 100;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1a05de09824360c451a4b0354d1a8f486432ec7b..f3b69a5eb5d15738d7061e10643ace23bd3718c4 100644
index 2e1214c9ebf7915aa25aa4d405ec75f73d8e0594..f6ad53b71c6d545a5989364516b8f2b17cfe7a63 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1453,6 +1453,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -38,7 +38,7 @@ index 1a05de09824360c451a4b0354d1a8f486432ec7b..f3b69a5eb5d15738d7061e10643ace23
public void a(Entity entity, int i, DamageSource damagesource) {
if (entity instanceof EntityPlayer) {
CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
@@ -2336,6 +2337,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2340,6 +2341,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.fallDistance = 0.0F;
}
@ -274,7 +274,7 @@ index 5ebd2d25cc52de3f1a091f0620d6b46be4fca784..b4b45d93188494ae0639ae4eb9c764a4
return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index fa211442594c72c0d9b2fddc85472aa9939d6d1e..32aba006312ef30401e09cf05325dd1fa82bfed0 100644
index a7dc4aabf10c9b9b10897e7540c4da9b0a2b6eb8..d6586e2c36f89328ba482230ae7d6a050966ed27 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -82,6 +82,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

4
Spigot-Server-Patches/0307-Reset-players-airTicks-on-respawn.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Reset players airTicks on respawn
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f3b69a5eb5d15738d7061e10643ace23bd3718c4..f13cb4fec9da1773729630bc0e8bd01ba7bb9344 100644
index f6ad53b71c6d545a5989364516b8f2b17cfe7a63..47c0fd89a82d91dc6083f9600ac6889e2b27234b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2249,6 +2249,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2253,6 +2253,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}

10
Spigot-Server-Patches/0319-force-entity-dismount-during-teleportation.patch
View File

@ -20,10 +20,10 @@ this is going to be the best soultion all around.
Improvements/suggestions welcome!
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f13cb4fec9da1773729630bc0e8bd01ba7bb9344..c3bf2328f2ebeefe81a35846f0c1b2f0b178920f 100644
index 47c0fd89a82d91dc6083f9600ac6889e2b27234b..915378493d9c5bb501b21eb7aca380580716f4c3 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1943,12 +1943,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1947,12 +1947,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
@ -41,7 +41,7 @@ index f13cb4fec9da1773729630bc0e8bd01ba7bb9344..c3bf2328f2ebeefe81a35846f0c1b2f0
}
}
@@ -2003,7 +2006,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2007,7 +2010,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return true; // CraftBukkit
}
@ -53,7 +53,7 @@ index f13cb4fec9da1773729630bc0e8bd01ba7bb9344..c3bf2328f2ebeefe81a35846f0c1b2f0
if (entity.getVehicle() == this) {
throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
} else {
@@ -2013,7 +2019,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2017,7 +2023,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
VehicleExitEvent event = new VehicleExitEvent(
(Vehicle) getBukkitEntity(),
@ -62,7 +62,7 @@ index f13cb4fec9da1773729630bc0e8bd01ba7bb9344..c3bf2328f2ebeefe81a35846f0c1b2f0
);
// Suppress during worldgen
if (this.valid) {
@@ -2027,7 +2033,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2031,7 +2037,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
// CraftBukkit end
// Spigot start

4
Spigot-Server-Patches/0339-Add-LivingEntity-getTargetEntity.patch
View File

@ -46,7 +46,7 @@ index 02c09f39848399a86d46bd17569b4f01a7b5ab1f..ed9b2f9adfecdc6d1b9925579ec51065
double[] adouble = new double[]{1.0D};
double d0 = vec3d1.x - vec3d.x;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c3bf2328f2ebeefe81a35846f0c1b2f0b178920f..431091b87370a8416a6945c560981ba1882894d4 100644
index 915378493d9c5bb501b21eb7aca380580716f4c3..8832ffc0fcf9410ecc07ac100c2c8e3cd4dbddff 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1419,6 +1419,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -57,7 +57,7 @@ index c3bf2328f2ebeefe81a35846f0c1b2f0b178920f..431091b87370a8416a6945c560981ba1
public final Vec3D j(float f) {
if (f == 1.0F) {
return new Vec3D(this.locX(), this.getHeadY(), this.locZ());
@@ -2052,6 +2053,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2056,6 +2057,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.getPassengers().size() < 1;
}

6
Spigot-Server-Patches/0341-Entity-getEntitySpawnReason.patch
View File

@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
or DEFAULT since data was not stored.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 431091b87370a8416a6945c560981ba1882894d4..a40e6d2f83b9f142d716b4b00dba05123d9e1c0a 100644
index 8832ffc0fcf9410ecc07ac100c2c8e3cd4dbddff..c754809203e33375365bbd3730dd266efefd84d2 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -74,6 +74,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -21,7 +21,7 @@ index 431091b87370a8416a6945c560981ba1882894d4..a40e6d2f83b9f142d716b4b00dba0512
// Paper end
public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
@@ -1582,6 +1583,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1585,6 +1586,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
if (this.origin != null) {
nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
}
@ -31,7 +31,7 @@ index 431091b87370a8416a6945c560981ba1882894d4..a40e6d2f83b9f142d716b4b00dba0512
// Save entity's from mob spawner status
if (spawnedViaMobSpawner) {
nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
@@ -1710,6 +1714,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1714,6 +1718,26 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status

4
Spigot-Server-Patches/0356-Duplicate-UUID-Resolve-Option.patch
View File

@ -93,10 +93,10 @@ index 5ee581d1634f44a98756c5d11def9c3d46fd53e9..8e3244fc5c6e5fff22857637b4ab5944
int k = MathHelper.floor(entity.locY() / 16.0D);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a40e6d2f83b9f142d716b4b00dba05123d9e1c0a..7d679c8651bca6041e330abc8b17102175ff5f7b 100644
index c754809203e33375365bbd3730dd266efefd84d2..fa67a0308d9fc89652a66af35919685fab06553d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2690,6 +2690,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2694,6 +2694,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
});
}

4
Spigot-Server-Patches/0407-Entity-Activation-Range-2.0.patch
View File

@ -14,7 +14,7 @@ Adds flying monsters to control ghast and phantoms
Adds villagers as separate config
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7d679c8651bca6041e330abc8b17102175ff5f7b..c844ee21d09eedee8c7e202afe4add0c84b8e11c 100644
index fa67a0308d9fc89652a66af35919685fab06553d..884049750af9887cd15d4af9bbcb57265dcd319d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -165,7 +165,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -56,7 +56,7 @@ index 7d679c8651bca6041e330abc8b17102175ff5f7b..c844ee21d09eedee8c7e202afe4add0c
vec3d = this.a(vec3d, enummovetype);
Vec3D vec3d1 = this.g(vec3d);
@@ -2708,6 +2717,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2712,6 +2721,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.ae;
}

4
Spigot-Server-Patches/0408-Fix-items-vanishing-through-end-portal.patch
View File

@ -13,10 +13,10 @@ Quickly loading the exact world spawn chunk before searching the
heightmap resolves the issue without having to load all spawn chunks.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c844ee21d09eedee8c7e202afe4add0c84b8e11c..0d62e517bb756b80758827a7ba171de3ae306a82 100644
index 884049750af9887cd15d4af9bbcb57265dcd319d..260e87eaec644c5b18c22a6638ef7e5d7f7b786b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2619,6 +2619,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2623,6 +2623,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
BlockPosition blockposition1;
if (flag1) {

6
Spigot-Server-Patches/0415-Add-option-to-nerf-pigmen-from-nether-portals.patch
View File

@ -32,7 +32,7 @@ index a224a04ee1bb9705166913ef1c66aa031d87c270..4132cd4c6f13cfa1c0cda43daaa908ff
}
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0d62e517bb756b80758827a7ba171de3ae306a82..6b525e813034cb43403f9b116b5d661eb3be49aa 100644
index 260e87eaec644c5b18c22a6638ef7e5d7f7b786b..14b860e6ba4cde37aa0a6d854187be5765acfa91 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -191,6 +191,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -43,7 +43,7 @@ index 0d62e517bb756b80758827a7ba171de3ae306a82..6b525e813034cb43403f9b116b5d661e
protected int numCollisions = 0; // Paper
public void inactiveTick() { }
// Spigot end
@@ -1599,6 +1600,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1602,6 +1603,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
if (spawnedViaMobSpawner) {
nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
}
@ -53,7 +53,7 @@ index 0d62e517bb756b80758827a7ba171de3ae306a82..6b525e813034cb43403f9b116b5d661e
// Paper end
return nbttagcompound;
} catch (Throwable throwable) {
@@ -1723,6 +1727,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1727,6 +1731,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status

4
Spigot-Server-Patches/0459-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch
View File

@ -7,10 +7,10 @@ The code following this has better support for null worlds to move
them back to the world spawn.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 810793ee13d0531dbbc233adc3d274cbcf3186b7..ccee2aa760ce38f7a48cb6a3360d1ec8d1a02450 100644
index 26c2adb04d995bf5c5ba4c5eee471be067bf8ac4..b21770e8549ed02ff68656584ecec1cf023542c5 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1713,9 +1713,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1717,9 +1717,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
bworld = server.getWorld(worldName);
}

10
Spigot-Server-Patches/0464-Fix-numerous-item-duplication-issues-and-teleport-is.patch
View File

@ -16,10 +16,10 @@ So even if something NEW comes up, it would be impossible to drop the
same item twice because the source was destroyed.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ccee2aa760ce38f7a48cb6a3360d1ec8d1a02450..63fddf52b5736ee88f47e7f987c52114a3d7df97 100644
index b21770e8549ed02ff68656584ecec1cf023542c5..112eb6e2568e535ae83cfb832d3b0fc1e46bef65 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1869,11 +1869,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1873,11 +1873,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
} else {
// CraftBukkit start - Capture drops for death event
if (this instanceof EntityLiving && !((EntityLiving) this).forceDrops) {
@ -34,7 +34,7 @@ index ccee2aa760ce38f7a48cb6a3360d1ec8d1a02450..63fddf52b5736ee88f47e7f987c52114
entityitem.defaultPickupDelay();
// CraftBukkit start
@@ -2516,6 +2517,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2520,6 +2521,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@Nullable
public Entity teleportTo(WorldServer worldserver, BlockPosition location) {
// CraftBukkit end
@ -47,7 +47,7 @@ index ccee2aa760ce38f7a48cb6a3360d1ec8d1a02450..63fddf52b5736ee88f47e7f987c52114
if (this.world instanceof WorldServer && !this.dead) {
this.world.getMethodProfiler().enter("changeDimension");
// CraftBukkit start
@@ -2551,7 +2558,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2555,7 +2562,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
entity.bukkitEntity = this.getBukkitEntity();
if (this instanceof EntityInsentient) {
@ -56,7 +56,7 @@ index ccee2aa760ce38f7a48cb6a3360d1ec8d1a02450..63fddf52b5736ee88f47e7f987c52114
}
// CraftBukkit end
}
@@ -2671,7 +2678,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2675,7 +2682,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean canPortal() {

6
Spigot-Server-Patches/0514-Ensure-Entity-AABB-s-are-never-invalid.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Ensure Entity AABB's are never invalid
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f41c91c0f27e6df8181fafe4c4332ce57b952ea9..7f33bcfe79a4fc8466f2b111cda4ec6c0290ca2d 100644
index 105fe1f32270bda3343a75b46b6eb89102174ca6..3190ed02f56587b565fe3f5b151ef44bd60401ff 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -391,7 +391,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -17,7 +17,7 @@ index f41c91c0f27e6df8181fafe4c4332ce57b952ea9..7f33bcfe79a4fc8466f2b111cda4ec6c
if (valid) ((WorldServer) world).chunkCheck(this); // CraftBukkit
}
@@ -2881,6 +2881,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2885,6 +2885,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return new AxisAlignedBB(vec3d, vec3d1);
}
@ -25,7 +25,7 @@ index f41c91c0f27e6df8181fafe4c4332ce57b952ea9..7f33bcfe79a4fc8466f2b111cda4ec6c
public void a(AxisAlignedBB axisalignedbb) {
// CraftBukkit start - block invalid bounding boxes
double minX = axisalignedbb.minX,
@@ -3319,6 +3320,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3323,6 +3324,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public void setPositionRaw(double d0, double d1, double d2) {

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 9aafdc9a782861665917c8f8490e9cf4eb7fd062
Subproject commit 049120068dee7b541ecab95fc8cf03f7e76f8337

2
work/Spigot

@ -1 +1 @@
Subproject commit d65430a1cd93c9158dad04e0a7c21cb4a4d4ba76
Subproject commit b5a13e6d369902135ae04e4e218846ad10201c85