Upstream
/
Paper
mirror of https://github.com/PaperMC/Paper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Auto] Updated Upstream (CraftBukkit) 

Upstream has released updates that appear 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:
6917945f0 SPIGOT-6289: Fix setting entity equipment
This commit is contained in:
Aikar 2020-12-22 16:02:19 -05:00
parent c83a661f6e
commit a70924789b
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
32 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Spigot-Server-Patches/0009-Timings-v2.patch
View File

@ -1004,7 +1004,7 @@ index d91b029c95b6380300db81e7c0fb172ff57958a1..218071260dec39dd4f7eb733ae6f832a
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index a90364503ffb72ee6fdb99a25101794b1aba7b81..01b026f9d765bf4969f7c6d1d265ef459bf32bf3 100644
index 5e0db989a0f6c7c7041a968550f4068b9a946136..a6534087b10c9a469a3d2cf4da717fab17b31544 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -31,7 +31,6 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@ -1040,7 +1040,7 @@ index a90364503ffb72ee6fdb99a25101794b1aba7b81..01b026f9d765bf4969f7c6d1d265ef45
protected BlockPosition ap() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 312fc8289c7f67e0e50184f72af6590ebd2469d3..0febffe30dfe5f0a24c9706f7e670d2bfd488367 100644
index c6d3b5c8b14808e10a64d6bf1ef971f8bcdbd48f..71584bb49fd98d825ea4d3d646b1ccc05269e92f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -42,7 +42,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -1052,7 +1052,7 @@ index 312fc8289c7f67e0e50184f72af6590ebd2469d3..0febffe30dfe5f0a24c9706f7e670d2b
public abstract class EntityLiving extends Entity {
@@ -2352,7 +2352,6 @@ public abstract class EntityLiving extends Entity {
@@ -2358,7 +2358,6 @@ public abstract class EntityLiving extends Entity {
@Override
public void tick() {
@ -1060,7 +1060,7 @@ index 312fc8289c7f67e0e50184f72af6590ebd2469d3..0febffe30dfe5f0a24c9706f7e670d2b
super.tick();
this.t();
this.v();
@@ -2401,9 +2400,7 @@ public abstract class EntityLiving extends Entity {
@@ -2407,9 +2406,7 @@ public abstract class EntityLiving extends Entity {
}
}
@ -1070,7 +1070,7 @@ index 312fc8289c7f67e0e50184f72af6590ebd2469d3..0febffe30dfe5f0a24c9706f7e670d2b
double d0 = this.locX() - this.lastX;
double d1 = this.locZ() - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -2483,8 +2480,6 @@ public abstract class EntityLiving extends Entity {
@@ -2489,8 +2486,6 @@ public abstract class EntityLiving extends Entity {
if (this.isSleeping()) {
this.pitch = 0.0F;
}
@ -1079,7 +1079,7 @@ index 312fc8289c7f67e0e50184f72af6590ebd2469d3..0febffe30dfe5f0a24c9706f7e670d2b
}
private void p() {
@@ -2666,7 +2661,6 @@ public abstract class EntityLiving extends Entity {
@@ -2672,7 +2667,6 @@ public abstract class EntityLiving extends Entity {
this.setMot(d4, d5, d6);
this.world.getMethodProfiler().enter("ai");
@ -1087,7 +1087,7 @@ index 312fc8289c7f67e0e50184f72af6590ebd2469d3..0febffe30dfe5f0a24c9706f7e670d2b
if (this.isFrozen()) {
this.jumping = false;
this.aR = 0.0F;
@@ -2676,7 +2670,6 @@ public abstract class EntityLiving extends Entity {
@@ -2682,7 +2676,6 @@ public abstract class EntityLiving extends Entity {
this.doTick();
this.world.getMethodProfiler().exit();
}
@ -1095,7 +1095,7 @@ index 312fc8289c7f67e0e50184f72af6590ebd2469d3..0febffe30dfe5f0a24c9706f7e670d2b
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("jump");
@@ -2711,9 +2704,9 @@ public abstract class EntityLiving extends Entity {
@@ -2717,9 +2710,9 @@ public abstract class EntityLiving extends Entity {
this.r();
AxisAlignedBB axisalignedbb = this.getBoundingBox();
@ -1107,7 +1107,7 @@ index 312fc8289c7f67e0e50184f72af6590ebd2469d3..0febffe30dfe5f0a24c9706f7e670d2b
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("push");
if (this.bf > 0) {
@@ -2721,9 +2714,7 @@ public abstract class EntityLiving extends Entity {
@@ -2727,9 +2720,7 @@ public abstract class EntityLiving extends Entity {
this.a(axisalignedbb, this.getBoundingBox());
}

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

@ -21,10 +21,10 @@ index e2cb804fd40e236337c37d89dfc85a02486c1bf4..cff769a0cffd81501f919fad0c6456e1
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index d10b768ab1a308d366b5ad9a7d9e79a599fd31b4..42620e3d2e922e7884b052ea956bea4ec3b68589 100644
index 52595b6534e2798b36b3a7c2d97451bd0ea2f3a0..716ea2fced5dc9e9a790f25e68252d5bd445b9ce 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2530,7 +2530,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2528,7 +2528,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

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

@ -25,10 +25,10 @@ index a6c02f676f4206f2f59862530999cd74a2e0c20f..1f229e68349f49d7c461b1d9895a7096
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 42620e3d2e922e7884b052ea956bea4ec3b68589..d8a2eaf51085b1581e3fb7ddb9e2b8b88ea293f6 100644
index 716ea2fced5dc9e9a790f25e68252d5bd445b9ce..02ad0b959e636d0f93cfd491b7b549364f92fbb6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2201,6 +2201,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2199,6 +2199,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@Nullable
public ScoreboardTeamBase getScoreboardTeam() {
@ -37,7 +37,7 @@ index 42620e3d2e922e7884b052ea956bea4ec3b68589..d8a2eaf51085b1581e3fb7ddb9e2b8b8
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index a82b0a62181386d1a03e713b10045623c39f86e9..668c0ee8936377e31152a0bdc08056c783da3c79 100644
index 02ad843e2d461609945d70be77f2e6334e8835a7..aeb6b01dfa6537f08129c254f3e1180299f56c99 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -648,6 +648,7 @@ public abstract class EntityLiving extends Entity {

8
Spigot-Server-Patches/0066-Custom-replacement-for-eaten-items.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Custom replacement for eaten items
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 668c0ee8936377e31152a0bdc08056c783da3c79..eb77f7f0c5c7706cc5025ecc8018fe27f480dd6a 100644
index aeb6b01dfa6537f08129c254f3e1180299f56c99..3858fabf74e7604a7c62806e98c68eed4a97a485 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3099,9 +3099,10 @@ public abstract class EntityLiving extends Entity {
@@ -3105,9 +3105,10 @@ public abstract class EntityLiving extends Entity {
this.b(this.activeItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
@ -20,7 +20,7 @@ index 668c0ee8936377e31152a0bdc08056c783da3c79..eb77f7f0c5c7706cc5025ecc8018fe27
world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -3115,6 +3116,13 @@ public abstract class EntityLiving extends Entity {
@@ -3121,6 +3122,13 @@ public abstract class EntityLiving extends Entity {
} else {
itemstack = this.activeItem.a(this.world, this);
}
@ -34,7 +34,7 @@ index 668c0ee8936377e31152a0bdc08056c783da3c79..eb77f7f0c5c7706cc5025ecc8018fe27
// CraftBukkit end
if (itemstack != this.activeItem) {
@@ -3122,6 +3130,11 @@ public abstract class EntityLiving extends Entity {
@@ -3128,6 +3136,11 @@ public abstract class EntityLiving extends Entity {
}
this.clearActiveItem();

4
Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] handle NaN health/absorb values and repair bad data
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index eb77f7f0c5c7706cc5025ecc8018fe27f480dd6a..e011051946ffcff17fd8fd24d49e7f204da41bfd 100644
index 3858fabf74e7604a7c62806e98c68eed4a97a485..28fc0288b625694fb2dc356cf7eff9d012b70c72 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -609,7 +609,13 @@ public abstract class EntityLiving extends Entity {
@ -34,7 +34,7 @@ index eb77f7f0c5c7706cc5025ecc8018fe27f480dd6a..e011051946ffcff17fd8fd24d49e7f20
// CraftBukkit start - Handle scaled health
if (this instanceof EntityPlayer) {
org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
@@ -2939,7 +2949,7 @@ public abstract class EntityLiving extends Entity {
@@ -2945,7 +2955,7 @@ public abstract class EntityLiving extends Entity {
}
public void setAbsorptionHearts(float f) {

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

@ -32,10 +32,10 @@ index 64da34a840dc433670675a30062b8b17c29dd0c4..3599aa415076525a4529664b9b9f0339
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 4f9b286c20a87006f58071b55d78cda946f53c67..06ad9a788194b796ea07cac0c9813c661ea7c9a6 100644
index 92edb4474167fa95fd36ae9ef86a9eafd29f9b23..703267fe8a9b5e9d49d3b2dbe1da93def15d1b54 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2677,6 +2677,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2675,6 +2675,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean bV() {

6
Spigot-Server-Patches/0137-Cap-Entity-Collisions.patch
View File

@ -27,7 +27,7 @@ index c221e9501998de14194bd91018efbc113308198c..11106a20ccc161f18c1d5491785e44bb
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 265c583ed68a9acb87d2c2e1eb9786c5f74847ab..90d2509865f5b43eb9061023a6315ac6e4f83faf 100644
index 170dad8be525b40d764b6e63c981f7b73775a01b..97abed1cede09624748e40331a15a021939568be 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -183,6 +183,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -39,10 +39,10 @@ index 265c583ed68a9acb87d2c2e1eb9786c5f74847ab..90d2509865f5b43eb9061023a6315ac6
// Spigot end
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index af460b43984c36475d99785a1b78a3db6b3fd1d9..8698cecf89ce509c2fc729e0e564c01e253e2b14 100644
index 41615dadb766cf33a59fbdd55bbc0db2e0e13dc7..43c6da710a2701d75cf7b6c559e426e3c8e370af 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2797,8 +2797,11 @@ public abstract class EntityLiving extends Entity {
@@ -2803,8 +2803,11 @@ public abstract class EntityLiving extends Entity {
}
}

4
Spigot-Server-Patches/0175-Add-PlayerArmorChangeEvent.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 4a58909e83e3b0c032143e7466a736e8a670cdf2..699d1ed5ccf4803c727c9c8dc1be2759468cd1ce 100644
index dd55c3d991b1713e1262fc54df558b729bf63bd7..1e49b2c84d9b35367a9bc89be0c606293b42f2c8 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1,5 +1,6 @@
@ -15,7 +15,7 @@ index 4a58909e83e3b0c032143e7466a736e8a670cdf2..699d1ed5ccf4803c727c9c8dc1be2759
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -2540,6 +2541,13 @@ public abstract class EntityLiving extends Entity {
@@ -2546,6 +2547,13 @@ public abstract class EntityLiving extends Entity {
ItemStack itemstack1 = this.getEquipment(enumitemslot);
if (!ItemStack.matches(itemstack1, itemstack)) {

6
Spigot-Server-Patches/0224-Make-shield-blocking-delay-configurable.patch
View File

@ -19,10 +19,10 @@ index 0c8160aa7098f117d2a174ffd944741b11818d10..de80d2d874d1787335fd393f3ffed0cd
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 699d1ed5ccf4803c727c9c8dc1be2759468cd1ce..134da62b90b7a167cd580680a986dd470a3b9aad 100644
index 1e49b2c84d9b35367a9bc89be0c606293b42f2c8..58c9ccb55ca727709ada59d0978ef9470a9df97a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3205,7 +3205,7 @@ public abstract class EntityLiving extends Entity {
@@ -3211,7 +3211,7 @@ public abstract class EntityLiving extends Entity {
if (this.isHandRaised() && !this.activeItem.isEmpty()) {
Item item = this.activeItem.getItem();
@ -31,7 +31,7 @@ index 699d1ed5ccf4803c727c9c8dc1be2759468cd1ce..134da62b90b7a167cd580680a986dd47
} else {
return false;
}
@@ -3461,4 +3461,15 @@ public abstract class EntityLiving extends Entity {
@@ -3467,4 +3467,15 @@ public abstract class EntityLiving extends Entity {
public void broadcastItemBreak(EnumHand enumhand) {
this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND);
}

4
Spigot-Server-Patches/0229-LivingEntity-Hand-Raised-Item-Use-API.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
How long an entity has raised hands to charge an attack or use an item
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 991839c39206ec984c442776693afdf50f90b409..97c0cc10d30a299a95e019f59bfcbbff176455ab 100644
index 0409f4584cff7dbf7e5266f9df45ac315c316ce1..8b05c47550adf5adc66bd802373b8339dca578f2 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -119,7 +119,7 @@ public abstract class EntityLiving extends Entity {
@ -18,7 +18,7 @@ index 991839c39206ec984c442776693afdf50f90b409..97c0cc10d30a299a95e019f59bfcbbff
protected int bd;
protected int be;
private BlockPosition bx;
@@ -3188,10 +3188,12 @@ public abstract class EntityLiving extends Entity {
@@ -3194,10 +3194,12 @@ public abstract class EntityLiving extends Entity {
return this.activeItem;
}

4
Spigot-Server-Patches/0240-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 508601b29c1f10ffabcf414d97189f5cd8c0a3af..2c3474c9a25fb8c5da8d3c8254c5865b10a8cf4f 100644
index ef3fb476615fe6a3aafdf5aebcf5680bfaa62e49..07941c987a0c644e896f49ce217c1c625dc25014 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2439,7 +2439,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2437,7 +2437,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public String toString() {

4
Spigot-Server-Patches/0266-Allow-disabling-armour-stand-ticking.patch
View File

@ -137,10 +137,10 @@ index 8922c656617bd8aed5b68f671d5191a537695bdf..8021d06b7765ad00abdbd8b77c37f7a8
this.datawatcher.set(EntityArmorStand.bh, vector3f);
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 97c0cc10d30a299a95e019f59bfcbbff176455ab..57395c71ce8e6c1b0246ca9bd7bf7f688e770d15 100644
index 8b05c47550adf5adc66bd802373b8339dca578f2..65db092417ddf7253c0b52e98d53b6cfc3744c3a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2520,6 +2520,7 @@ public abstract class EntityLiving extends Entity {
@@ -2526,6 +2526,7 @@ public abstract class EntityLiving extends Entity {
}
}

4
Spigot-Server-Patches/0277-Add-ray-tracing-methods-to-LivingEntity.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 57395c71ce8e6c1b0246ca9bd7bf7f688e770d15..4f80d94629ffba2960916628ccd9b53f08365612 100644
index 65db092417ddf7253c0b52e98d53b6cfc3744c3a..b00c7fda9aa7328848e0aff3a5897063f8a5abd6 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3480,6 +3480,23 @@ public abstract class EntityLiving extends Entity {
@@ -3486,6 +3486,23 @@ public abstract class EntityLiving extends Entity {
this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND);
}
// Paper start

8
Spigot-Server-Patches/0279-Improve-death-events.patch
View File

@ -27,7 +27,7 @@ index 0790d45e3c8ac68c280b9378d93061b48b045639..a8054a599e3eb502e7bbce903b568398
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 05c4d335397c39f44ebff705f694ea660f7142f5..2068f0630d947d36037cb3f4e472235051240110 100644
index b2cccdc9f2f243cd3fb1283ade0280b2acb0f772..4923fe299e7f057d5d70d346e83e746185eafdd3 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1452,6 +1452,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -38,7 +38,7 @@ index 05c4d335397c39f44ebff705f694ea660f7142f5..2068f0630d947d36037cb3f4e4722350
public void a(Entity entity, int i, DamageSource damagesource) {
if (entity instanceof EntityPlayer) {
CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
@@ -2353,6 +2354,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2351,6 +2352,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.fallDistance = 0.0F;
}
@ -119,7 +119,7 @@ index 09d076db37507b17797635df232a568752c97584..3bcebb89c9f9a5243d1d215a47d7d5e6
public void saveData(NBTTagCompound nbttagcompound) {
super.saveData(nbttagcompound);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 4f80d94629ffba2960916628ccd9b53f08365612..c0e7d10955ea7f0df4025491a18ab3040ea25437 100644
index b00c7fda9aa7328848e0aff3a5897063f8a5abd6..1dc5bad650c3035005175c9d5e37d91994e3d97f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -96,7 +96,7 @@ public abstract class EntityLiving extends Entity {
@ -260,7 +260,7 @@ index 4f80d94629ffba2960916628ccd9b53f08365612..c0e7d10955ea7f0df4025491a18ab304
@Nullable
protected SoundEffect getSoundDeath() {
return SoundEffects.ENTITY_GENERIC_DEATH;
@@ -2090,10 +2121,12 @@ public abstract class EntityLiving extends Entity {
@@ -2096,10 +2127,12 @@ public abstract class EntityLiving extends Entity {
}

4
Spigot-Server-Patches/0303-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 2068f0630d947d36037cb3f4e472235051240110..c488db132f80156db95d98a9b094d0352a46be2d 100644
index 4923fe299e7f057d5d70d346e83e746185eafdd3..470f8f1440c62b30a9df6cf356003dd35a69ee46 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2266,6 +2266,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2264,6 +2264,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}

6
Spigot-Server-Patches/0315-force-entity-dismount-during-teleportation.patch
View File

@ -20,7 +20,7 @@ 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 c488db132f80156db95d98a9b094d0352a46be2d..6e5af77467f7fdf36a2af86399eef54bb8f15a24 100644
index 470f8f1440c62b30a9df6cf356003dd35a69ee46..ea0525ca0b52b3270b868cc8a526c7139baa4db8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1954,12 +1954,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -91,10 +91,10 @@ index c0b061f588944b2a9a82bea4087c68423c7e22a1..14e3496f6f382e8f259f5b55be43b3c2
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index c0e7d10955ea7f0df4025491a18ab3040ea25437..c3cb6ac7e7ab05f208f43a63d733f760098e46c1 100644
index 1dc5bad650c3035005175c9d5e37d91994e3d97f..c0703015ce72c65006e212ca1a6dbd3ce3c6a782 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2910,11 +2910,13 @@ public abstract class EntityLiving extends Entity {
@@ -2916,11 +2916,13 @@ public abstract class EntityLiving extends Entity {
return ((Byte) this.datawatcher.get(EntityLiving.ag) & 4) != 0;
}

6
Spigot-Server-Patches/0334-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 6e5af77467f7fdf36a2af86399eef54bb8f15a24..9384cd901f934c41dcfadde29561fadfa0e523f8 100644
index ea0525ca0b52b3270b868cc8a526c7139baa4db8..f999920fcc61109d2359ada18fb4272e25c2fcc7 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1418,6 +1418,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -66,10 +66,10 @@ index 6e5af77467f7fdf36a2af86399eef54bb8f15a24..9384cd901f934c41dcfadde29561fadf
return 0.0F;
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index c3cb6ac7e7ab05f208f43a63d733f760098e46c1..6e3fb6c7da3195496c7978eb8cd8ccc905fcd3ef 100644
index c0703015ce72c65006e212ca1a6dbd3ce3c6a782..a68d9d709a7413f40f927c20bd53311b558d9541 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3532,6 +3532,37 @@ public abstract class EntityLiving extends Entity {
@@ -3538,6 +3538,37 @@ public abstract class EntityLiving extends Entity {
return world.rayTrace(raytrace);
}

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

@ -93,10 +93,10 @@ index e0f1eb19ea1ceebe00a428c753fec13d317869dd..fdd754a06fc6566b448d9847e210e7cd
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 14c2929d0ed0dcbd22a7efd310c2da9d9ccbe09a..6929ede827334d58ac91eab30566110acce8a495 100644
index 073660a67ece962981b388a8b0f5402ce2a430c6..ba18da7b9d069b1d553c2ae8838296351e3358aa 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2707,6 +2707,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2705,6 +2705,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
});
}

8
Spigot-Server-Patches/0375-Prevent-consuming-the-wrong-itemstack.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Prevent consuming the wrong itemstack
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 6e3fb6c7da3195496c7978eb8cd8ccc905fcd3ef..1685478f333a387d270ec4533319b9a62076a9ef 100644
index a68d9d709a7413f40f927c20bd53311b558d9541..dbd212fc2f0c95ab1dcc4b6be86f0f87ac726fa7 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3095,10 +3095,13 @@ public abstract class EntityLiving extends Entity {
@@ -3101,10 +3101,13 @@ public abstract class EntityLiving extends Entity {
this.datawatcher.set(EntityLiving.ag, (byte) j);
}
@ -24,7 +24,7 @@ index 6e3fb6c7da3195496c7978eb8cd8ccc905fcd3ef..1685478f333a387d270ec4533319b9a6
this.activeItem = itemstack;
this.bd = itemstack.k();
if (!this.world.isClientSide) {
@@ -3176,6 +3179,7 @@ public abstract class EntityLiving extends Entity {
@@ -3182,6 +3185,7 @@ public abstract class EntityLiving extends Entity {
this.releaseActiveItem();
} else {
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@ -32,7 +32,7 @@ index 6e3fb6c7da3195496c7978eb8cd8ccc905fcd3ef..1685478f333a387d270ec4533319b9a6
this.b(this.activeItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
@@ -3210,8 +3214,8 @@ public abstract class EntityLiving extends Entity {
@@ -3216,8 +3220,8 @@ public abstract class EntityLiving extends Entity {
}
this.clearActiveItem();

12
Spigot-Server-Patches/0396-Lag-compensate-eating.patch
View File

@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating.
Change to also use a time check instead if it passes.
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 44793c443bd8c357832daa5c65cc2230ef031dc2..dec5eeea9460102dcb552329d90d055cd11c798c 100644
index 37e3efa1fed858f735166a5c0cb97f886b2bbb4e..e86500d789a713d763c64448cfa7141a15d6b4bd 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -120,7 +120,7 @@ public abstract class EntityLiving extends Entity {
@ -19,7 +19,7 @@ index 44793c443bd8c357832daa5c65cc2230ef031dc2..dec5eeea9460102dcb552329d90d055c
protected int be;
private BlockPosition bx;
private Optional<BlockPosition> by;
@@ -3045,6 +3045,11 @@ public abstract class EntityLiving extends Entity {
@@ -3051,6 +3051,11 @@ public abstract class EntityLiving extends Entity {
return ((Byte) this.datawatcher.get(EntityLiving.ag) & 2) > 0 ? EnumHand.OFF_HAND : EnumHand.MAIN_HAND;
}
@ -31,7 +31,7 @@ index 44793c443bd8c357832daa5c65cc2230ef031dc2..dec5eeea9460102dcb552329d90d055c
private void t() {
if (this.isHandRaised()) {
if (ItemStack.d(this.b(this.getRaisedHand()), this.activeItem)) {
@@ -3054,7 +3059,12 @@ public abstract class EntityLiving extends Entity {
@@ -3060,7 +3065,12 @@ public abstract class EntityLiving extends Entity {
this.b(this.activeItem, 5);
}
@ -45,7 +45,7 @@ index 44793c443bd8c357832daa5c65cc2230ef031dc2..dec5eeea9460102dcb552329d90d055c
this.s();
}
} else {
@@ -3104,7 +3114,10 @@ public abstract class EntityLiving extends Entity {
@@ -3110,7 +3120,10 @@ public abstract class EntityLiving extends Entity {
if (!itemstack.isEmpty() && !this.isHandRaised() || forceUpdate) { // Paper use override flag
this.activeItem = itemstack;
@ -57,7 +57,7 @@ index 44793c443bd8c357832daa5c65cc2230ef031dc2..dec5eeea9460102dcb552329d90d055c
if (!this.world.isClientSide) {
this.c(1, true);
this.c(2, enumhand == EnumHand.OFF_HAND);
@@ -3128,7 +3141,10 @@ public abstract class EntityLiving extends Entity {
@@ -3134,7 +3147,10 @@ public abstract class EntityLiving extends Entity {
}
} else if (!this.isHandRaised() && !this.activeItem.isEmpty()) {
this.activeItem = ItemStack.b;
@ -69,7 +69,7 @@ index 44793c443bd8c357832daa5c65cc2230ef031dc2..dec5eeea9460102dcb552329d90d055c
}
}
@@ -3256,7 +3272,10 @@ public abstract class EntityLiving extends Entity {
@@ -3262,7 +3278,10 @@ public abstract class EntityLiving extends Entity {
}
this.activeItem = ItemStack.b;

6
Spigot-Server-Patches/0401-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 6929ede827334d58ac91eab30566110acce8a495..c5093aa5ce953384fcd9c27da59d60e30678d376 100644
index ba18da7b9d069b1d553c2ae8838296351e3358aa..1fa7b82685a5e55d57d78abd5151f20e20178646 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -163,7 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -64,7 +64,7 @@ index 6929ede827334d58ac91eab30566110acce8a495..c5093aa5ce953384fcd9c27da59d60e3
public void k(Entity entity) {
this.a(entity, Entity::setPosition);
}
@@ -2725,6 +2735,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2723,6 +2733,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.ae;
}
@ -118,7 +118,7 @@ index d91503b3e46c6ded3d77da4feeb8350df5bf924c..dcc5b098bfe36ef7ee8536b3da65c4ce
if (this.isPassenger() && this.getVehicle() instanceof EntityInsentient) {
EntityInsentient entityinsentient = (EntityInsentient) this.getVehicle();
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index dec5eeea9460102dcb552329d90d055cd11c798c..7ecd1f7d4aae0aef429984d32fff708bfc068ee9 100644
index e86500d789a713d763c64448cfa7141a15d6b4bd..4cf740c3661aea67f12afeb564cb84db626ffa81 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -98,7 +98,7 @@ public abstract class EntityLiving extends Entity {

4
Spigot-Server-Patches/0402-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 c5093aa5ce953384fcd9c27da59d60e30678d376..4f89a265a449d3ab7bc1073864c38d7a20927148 100644
index 1fa7b82685a5e55d57d78abd5151f20e20178646..240675705fe52af6326b78ce0e3bf8ec0e8b50e1 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2637,6 +2637,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2635,6 +2635,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
BlockPosition blockposition1;
if (flag1) {

4
Spigot-Server-Patches/0408-Entity-Jump-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Entity Jump API
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 7ecd1f7d4aae0aef429984d32fff708bfc068ee9..6e96a59e9d0f51d850bf19ee59ad284822a9b576 100644
index 4cf740c3661aea67f12afeb564cb84db626ffa81..364a4de656b680e871dd4ff0ad5130f4d10d57e6 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2770,8 +2770,10 @@ public abstract class EntityLiving extends Entity {
@@ -2776,8 +2776,10 @@ public abstract class EntityLiving extends Entity {
} else if (this.aQ() && (!this.onGround || d7 > d8)) {
this.c((Tag) TagsFluid.LAVA);
} else if ((this.onGround || flag && d7 <= d8) && this.jumpTicks == 0) {

4
Spigot-Server-Patches/0444-Don-t-run-entity-collision-code-if-not-needed.patch
View File

@ -7,10 +7,10 @@ Will not run if max entity craming is disabled and
the max collisions per entity is less than or equal to 0
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 6e96a59e9d0f51d850bf19ee59ad284822a9b576..25af1a69317cda73fb93689c899fcee676ff5c95 100644
index 364a4de656b680e871dd4ff0ad5130f4d10d57e6..91881c7a61edeed5f7dbc390aab96ed5db163ed8 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2838,10 +2838,16 @@ public abstract class EntityLiving extends Entity {
@@ -2844,10 +2844,16 @@ public abstract class EntityLiving extends Entity {
protected void doTick() {}
protected void collideNearby() {

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

@ -16,7 +16,7 @@ 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 4eb37ac65e80569979544c71c71ed192740535a2..c5106449fc0196cdba8ad0325dd0c247e9d9040f 100644
index 5bec3b9692f64a792e26f89b4147644eaaf4ab11..60dae06ff5c016aecba23afd7a4152fcd3234616 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1880,11 +1880,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -34,7 +34,7 @@ index 4eb37ac65e80569979544c71c71ed192740535a2..c5106449fc0196cdba8ad0325dd0c247
entityitem.defaultPickupDelay();
// CraftBukkit start
@@ -2534,6 +2535,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2532,6 +2533,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@Nullable
public Entity teleportTo(WorldServer worldserver, BlockPosition location) {
// CraftBukkit end
@ -47,7 +47,7 @@ index 4eb37ac65e80569979544c71c71ed192740535a2..c5106449fc0196cdba8ad0325dd0c247
if (this.world instanceof WorldServer && !this.dead) {
this.world.getMethodProfiler().enter("changeDimension");
// CraftBukkit start
@@ -2569,7 +2576,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2567,7 +2574,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
entity.bukkitEntity = this.getBukkitEntity();
if (this instanceof EntityInsentient) {
@ -56,7 +56,7 @@ index 4eb37ac65e80569979544c71c71ed192740535a2..c5106449fc0196cdba8ad0325dd0c247
}
// CraftBukkit end
}
@@ -2689,7 +2696,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2687,7 +2694,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean canPortal() {

6
Spigot-Server-Patches/0508-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 3c93f016d904930baf8955edb3b06476ee1e47ac..5c67fc3a4f4c71745c5f5b6e9d75ce7493c8e978 100644
index d883da1e9101607209148a28aef8741407f13433..c9f5f341371e1ccc7c9a71bb357862424d801d8a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -389,7 +389,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -17,7 +17,7 @@ index 3c93f016d904930baf8955edb3b06476ee1e47ac..5c67fc3a4f4c71745c5f5b6e9d75ce74
if (valid) ((WorldServer) world).chunkCheck(this); // CraftBukkit
}
@@ -2899,6 +2899,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2897,6 +2897,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return new AxisAlignedBB(vec3d, vec3d1);
}
@ -25,7 +25,7 @@ index 3c93f016d904930baf8955edb3b06476ee1e47ac..5c67fc3a4f4c71745c5f5b6e9d75ce74
public void a(AxisAlignedBB axisalignedbb) {
// CraftBukkit start - block invalid bounding boxes
double minX = axisalignedbb.minX,
@@ -3337,6 +3338,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3335,6 +3336,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public void setPositionRaw(double d0, double d1, double d2) {

4
Spigot-Server-Patches/0526-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Don't check chunk for portal on world gen entity add
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 97696e489413cb93bd12299a886b18152f32f522..df66083880e8416d2ddb3ec5ef0290a489929942 100644
index e34f3c24be9defab765aaf7c54225759ad5ce60a..6b3e521dac8823ac8103f5aa2b1ea62edb260a72 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2935,7 +2935,7 @@ public abstract class EntityLiving extends Entity {
@@ -2941,7 +2941,7 @@ public abstract class EntityLiving extends Entity {
Entity entity = this.getVehicle();
super.stopRiding(suppressCancellation); // Paper - suppress

4
Spigot-Server-Patches/0574-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Expose the Entity Counter to allow plugins to use valid and
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 1f73ffbdd5b1b5906573ca4ba5c16a4f31b4c79a..cfc6e127257340333a666c826f3a0b77f83eea33 100644
index fa0256a99c833e6035b8d3e873a93af2b674ef52..53fb4f04087c091f3354e74d6b94554601f2cbe0 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3377,4 +3377,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3375,4 +3375,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}

4
Spigot-Server-Patches/0576-Entity-isTicking.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Entity#isTicking
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index cfc6e127257340333a666c826f3a0b77f83eea33..6e0585bfe6ef371a93e6a99475233de7f08d2634 100644
index 53fb4f04087c091f3354e74d6b94554601f2cbe0..d86b67a63b37569fc4ca69ec04305a330950b0f2 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3382,5 +3382,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3380,5 +3380,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public static int nextEntityId() {
return entityCount.incrementAndGet();
}

4
Spigot-Server-Patches/0579-Fix-CME-on-adding-a-passenger-in-CreatureSpawnEvent.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Fix CME on adding a passenger in CreatureSpawnEvent
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 6e0585bfe6ef371a93e6a99475233de7f08d2634..959848eba4900ece787373a3af201be8c6323ca2 100644
index d86b67a63b37569fc4ca69ec04305a330950b0f2..0c952fea30aa6890809d728420e4710d95e10c19 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3080,7 +3080,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3078,7 +3078,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public Stream<Entity> cp() {

8
Spigot-Server-Patches/0608-Climbing-should-not-bypass-cramming-gamerule.patch
View File

@ -19,7 +19,7 @@ index 80b0c08cef9a5326492b1faec020929fca59ff77..5596d9f42523dbcbad47d21a4b2fdba3
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 959848eba4900ece787373a3af201be8c6323ca2..091d55c04c663df07c69f637515f53990c3c2d46 100644
index 0c952fea30aa6890809d728420e4710d95e10c19..e44e5652c12fbee51acedc1f911181b8443fae93 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1483,6 +1483,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -88,7 +88,7 @@ index 8af1fe5d820f3bcb5e02dd2300e8e9cbd7e4e201..fcb31147622b4b81934be05ffc8de5e8
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index df66083880e8416d2ddb3ec5ef0290a489929942..53d193fab101192ee0e0a5519b78c354122db353 100644
index 6b3e521dac8823ac8103f5aa2b1ea62edb260a72..dd3287f953a1a24d2406816b3c0ae176476b6452 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -43,7 +43,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -99,7 +99,7 @@ index df66083880e8416d2ddb3ec5ef0290a489929942..53d193fab101192ee0e0a5519b78c354
public abstract class EntityLiving extends Entity {
@@ -2853,7 +2852,7 @@ public abstract class EntityLiving extends Entity {
@@ -2859,7 +2858,7 @@ public abstract class EntityLiving extends Entity {
return;
}
// Paper - end don't run getEntities if we're not going to use its result
@ -108,7 +108,7 @@ index df66083880e8416d2ddb3ec5ef0290a489929942..53d193fab101192ee0e0a5519b78c354
if (!list.isEmpty()) {
// Paper - move up
@@ -2991,9 +2990,16 @@ public abstract class EntityLiving extends Entity {
@@ -2997,9 +2996,16 @@ public abstract class EntityLiving extends Entity {
return !this.dead && this.collides; // CraftBukkit
}

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 878b43758db4dbe6e9cc0c07c3b52d8c96344d5d
Subproject commit 6917945f071bb90c888d73bfc6a100b11baa7905