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

Updated Upstream (Bukkit/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

Bukkit Changes:
6f9fe1d9 #562: Add API to set equipment silently
bcddb754 SPIGOT-6256: Add method to check if the entity is in water

CraftBukkit Changes:
878b4375 #772: Add API to set equipment silently
22d7fcc9 SPIGOT-6256: Add method to check if the entity is in water
This commit is contained in:
Shane Freeder 2020-12-21 07:56:22 +00:00
parent d5f3458c8c
commit abca14ff96
61 changed files with 193 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-API-Patches/0007-Entity-Origin-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 0ce26694eab5609d82c5498d1586b3dc22b4a037..20c9006b33851e0e1cc12c390dc65a41222cc969 100644
index 344c14a5ed86e9ebe401bfb5ba3aedc0c0ed0b04..7c3100d44ca42fe9c9ffedad321be9f2e446491a 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -595,4 +595,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -602,4 +602,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@Override
Spigot spigot();
// Spigot end

4
Spigot-API-Patches/0058-Entity-fromMobSpawner.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 20c9006b33851e0e1cc12c390dc65a41222cc969..9902b05352ce2acaf2bdd871238c6d80f255f0f1 100644
index 7c3100d44ca42fe9c9ffedad321be9f2e446491a..a73af8caad4014fecbca9c1c09cb519cb1fc3eb1 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -606,5 +606,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -613,5 +613,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@Nullable
Location getOrigin();

4
Spigot-API-Patches/0117-Entity-getChunk-API.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
Get the chunk the entity is currently registered to
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 9902b05352ce2acaf2bdd871238c6d80f255f0f1..5e988ac7a639476c0f80786c8aea51ba3377fd10 100644
index a73af8caad4014fecbca9c1c09cb519cb1fc3eb1..6d010cdebcb490b57618d3865fdb776a023853bf 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -3,6 +3,7 @@ package org.bukkit.entity;
@ -17,7 +17,7 @@ index 9902b05352ce2acaf2bdd871238c6d80f255f0f1..5e988ac7a639476c0f80786c8aea51ba
import org.bukkit.EntityEffect;
import org.bukkit.Location;
import org.bukkit.Nameable;
@@ -613,5 +614,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -620,5 +621,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return True if entity spawned from a mob spawner
*/
boolean fromMobSpawner();

6
Spigot-API-Patches/0132-Async-Chunks-API.patch
View File

@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
Also adds utility methods to Entity to teleport asynchronously.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index ff132bd7677e384debf2399ba9b1ffdb932541e9..210f1ccf7a26598ab6353374dcb5c6e6dd34c42f 100644
index a09cbfa277c82522be406ef079aa32d921c67799..d7367f6819fa0feb535293da301da862f0dd850e 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -221,6 +221,482 @@ public interface World extends PluginMessageRecipient, Metadatable {
@ -495,10 +495,10 @@ index ff132bd7677e384debf2399ba9b1ffdb932541e9..210f1ccf7a26598ab6353374dcb5c6e6
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index d6451c82e0189e2c591a0fc1f884e83931d5a41b..12729b6d9b3902c7c225655de273cb3c075fb695 100644
index cd46036960aac542a3ced9a8cdfcb1d35913cb76..71bda0f3be3c0b8b7fbb95e564101330d91f90c0 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -156,6 +156,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -163,6 +163,33 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
public boolean teleport(@NotNull Entity destination, @NotNull TeleportCause cause);

4
Spigot-API-Patches/0171-Entity-getEntitySpawnReason.patch
View File

@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners,
or DEFAULT since data was not stored.
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 12729b6d9b3902c7c225655de273cb3c075fb695..0053b1d4f6ebf21d108dd40b9ce2a9e081ecea98 100644
index 71bda0f3be3c0b8b7fbb95e564101330d91f90c0..52144f9ddbe700dc4e7201642511219c47a334ed 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -649,5 +649,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -656,5 +656,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull
Chunk getChunk();

9
Spigot-API-Patches/0213-Add-entity-liquid-API.patch
View File

@ -5,20 +5,15 @@ Subject: [PATCH] Add entity liquid API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 0053b1d4f6ebf21d108dd40b9ce2a9e081ecea98..d9ffa92f817f3b850cd7272450d2432b47f1fecf 100644
index 52144f9ddbe700dc4e7201642511219c47a334ed..9aa80ba2df23e83642ff2bb1afa9ee9ea9ce47dd 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -655,5 +655,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -662,5 +662,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull
org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
+
+ /**
+ * Check if entity is in water
+ */
+ public boolean isInWater();
+
+ /**
+ * Check if entity is in rain
+ */
+ public boolean isInRain();

4
Spigot-API-Patches/0227-Entity-isTicking.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Entity#isTicking
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index d9ffa92f817f3b850cd7272450d2432b47f1fecf..3c4369841d6d890dc2a5f161d5d0099bd535a0c6 100644
index 9aa80ba2df23e83642ff2bb1afa9ee9ea9ce47dd..b07b4990507113d31b1435179d9813c5ea0309f8 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -690,5 +690,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -692,5 +692,10 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* Check if entity is in lava
*/
public boolean isInLava();

4
Spigot-API-Patches/0228-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Clarify the Javadocs for Entity.getEntitySpawnReason()
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 3c4369841d6d890dc2a5f161d5d0099bd535a0c6..ff2e4fc8a632453e280f1a6ec05878b0e7fd2a9c 100644
index b07b4990507113d31b1435179d9813c5ea0309f8..76e857c364fe79e20cf9bde54b65e5b7108174fd 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -651,7 +651,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -658,7 +658,7 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
Chunk getChunk();
/**

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 5e0db989a0f6c7c7041a968550f4068b9a946136..a6534087b10c9a469a3d2cf4da717fab17b31544 100644
index a90364503ffb72ee6fdb99a25101794b1aba7b81..01b026f9d765bf4969f7c6d1d265ef459bf32bf3 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 5e0db989a0f6c7c7041a968550f4068b9a946136..a6534087b10c9a469a3d2cf4da717fab
protected BlockPosition ap() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index fea94330301a7859cd7ab9af7a9cd3f6d2d8e79a..c3aca7ebf5aae1c0582a0683920a4b82fa98a43f 100644
index 312fc8289c7f67e0e50184f72af6590ebd2469d3..0febffe30dfe5f0a24c9706f7e670d2bfd488367 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 fea94330301a7859cd7ab9af7a9cd3f6d2d8e79a..c3aca7ebf5aae1c0582a0683920a4b82
public abstract class EntityLiving extends Entity {
@@ -2346,7 +2346,6 @@ public abstract class EntityLiving extends Entity {
@@ -2352,7 +2352,6 @@ public abstract class EntityLiving extends Entity {
@Override
public void tick() {
@ -1060,7 +1060,7 @@ index fea94330301a7859cd7ab9af7a9cd3f6d2d8e79a..c3aca7ebf5aae1c0582a0683920a4b82
super.tick();
this.t();
this.v();
@@ -2395,9 +2394,7 @@ public abstract class EntityLiving extends Entity {
@@ -2401,9 +2400,7 @@ public abstract class EntityLiving extends Entity {
}
}
@ -1070,7 +1070,7 @@ index fea94330301a7859cd7ab9af7a9cd3f6d2d8e79a..c3aca7ebf5aae1c0582a0683920a4b82
double d0 = this.locX() - this.lastX;
double d1 = this.locZ() - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -2477,8 +2474,6 @@ public abstract class EntityLiving extends Entity {
@@ -2483,8 +2480,6 @@ public abstract class EntityLiving extends Entity {
if (this.isSleeping()) {
this.pitch = 0.0F;
}
@ -1079,7 +1079,7 @@ index fea94330301a7859cd7ab9af7a9cd3f6d2d8e79a..c3aca7ebf5aae1c0582a0683920a4b82
}
private void p() {
@@ -2660,7 +2655,6 @@ public abstract class EntityLiving extends Entity {
@@ -2666,7 +2661,6 @@ public abstract class EntityLiving extends Entity {
this.setMot(d4, d5, d6);
this.world.getMethodProfiler().enter("ai");
@ -1087,7 +1087,7 @@ index fea94330301a7859cd7ab9af7a9cd3f6d2d8e79a..c3aca7ebf5aae1c0582a0683920a4b82
if (this.isFrozen()) {
this.jumping = false;
this.aR = 0.0F;
@@ -2670,7 +2664,6 @@ public abstract class EntityLiving extends Entity {
@@ -2676,7 +2670,6 @@ public abstract class EntityLiving extends Entity {
this.doTick();
this.world.getMethodProfiler().exit();
}
@ -1095,7 +1095,7 @@ index fea94330301a7859cd7ab9af7a9cd3f6d2d8e79a..c3aca7ebf5aae1c0582a0683920a4b82
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("jump");
@@ -2705,9 +2698,9 @@ public abstract class EntityLiving extends Entity {
@@ -2711,9 +2704,9 @@ public abstract class EntityLiving extends Entity {
this.r();
AxisAlignedBB axisalignedbb = this.getBoundingBox();
@ -1107,7 +1107,7 @@ index fea94330301a7859cd7ab9af7a9cd3f6d2d8e79a..c3aca7ebf5aae1c0582a0683920a4b82
this.world.getMethodProfiler().exit();
this.world.getMethodProfiler().enter("push");
if (this.bf > 0) {
@@ -2715,9 +2708,7 @@ public abstract class EntityLiving extends Entity {
@@ -2721,9 +2714,7 @@ public abstract class EntityLiving extends Entity {
this.a(axisalignedbb, this.getBoundingBox());
}

6
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 a54c0b9c7c0de7c74813717e690cc9aa6cc32b67..26ad7e7d44dc1195f7ab948d2b42bf629c2702a7 100644
index 3e37374eba5d806a8e776924e034d26b06f26766..f20c6f1d2118a5f3feaace82f1c472c8ebbd26c0 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -162,6 +162,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -117,10 +117,10 @@ index da01aac42b32af6831a69f49e43d77fd6d5704ca..5c5229a815f098411450f6affb883c40
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index c20f161eb42159edcfe2c47e3749d88fba9b4747..2896dae1093e148f776905bf18ddb5b73deec326 100644
index db7c4011c8b90b6daca2b48a6d9ec447d31f7197..b9a789b161d20aefd93142cb7549f3023d402e8c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1044,4 +1044,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1049,4 +1049,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return spigot;
}
// Spigot end

8
Spigot-Server-Patches/0033-Disable-explosion-knockback.patch
View File

@ -19,10 +19,10 @@ index 41d03030741f2bc5dd904957be546de82be61a47..623186e8503ff1debabc409b27fd3d29
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index c3aca7ebf5aae1c0582a0683920a4b82fa98a43f..3c4ce04c811e2df9877965ec35f773a7017c6e45 100644
index 0febffe30dfe5f0a24c9706f7e670d2bfd488367..a82b0a62181386d1a03e713b10045623c39f86e9 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1184,6 +1184,7 @@ public abstract class EntityLiving extends Entity {
@@ -1190,6 +1190,7 @@ public abstract class EntityLiving extends Entity {
}
}
@ -30,7 +30,7 @@ index c3aca7ebf5aae1c0582a0683920a4b82fa98a43f..3c4ce04c811e2df9877965ec35f773a7
if (flag1) {
if (flag) {
this.world.broadcastEntityEffect(this, (byte) 29);
@@ -1202,6 +1203,7 @@ public abstract class EntityLiving extends Entity {
@@ -1208,6 +1209,7 @@ public abstract class EntityLiving extends Entity {
b0 = 2;
}
@ -38,7 +38,7 @@ index c3aca7ebf5aae1c0582a0683920a4b82fa98a43f..3c4ce04c811e2df9877965ec35f773a7
this.world.broadcastEntityEffect(this, b0);
}
@@ -1225,6 +1227,7 @@ public abstract class EntityLiving extends Entity {
@@ -1231,6 +1233,7 @@ public abstract class EntityLiving extends Entity {
}
}

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

8
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 716ea2fced5dc9e9a790f25e68252d5bd445b9ce..02ad0b959e636d0f93cfd491b7b549364f92fbb6 100644
index 42620e3d2e922e7884b052ea956bea4ec3b68589..d8a2eaf51085b1581e3fb7ddb9e2b8b88ea293f6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2199,6 +2199,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2201,6 +2201,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@Nullable
public ScoreboardTeamBase getScoreboardTeam() {
@ -37,10 +37,10 @@ index 716ea2fced5dc9e9a790f25e68252d5bd445b9ce..02ad0b959e636d0f93cfd491b7b54936
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 3c4ce04c811e2df9877965ec35f773a7017c6e45..4a67a78bbb7b633dcf5ea490b888898487a63d7a 100644
index a82b0a62181386d1a03e713b10045623c39f86e9..668c0ee8936377e31152a0bdc08056c783da3c79 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -642,6 +642,7 @@ public abstract class EntityLiving extends Entity {
@@ -648,6 +648,7 @@ public abstract class EntityLiving extends Entity {
if (nbttagcompound.hasKeyOfType("Team", 8)) {
String s = nbttagcompound.getString("Team");
ScoreboardTeam scoreboardteam = this.world.getScoreboard().getTeam(s);

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 4a67a78bbb7b633dcf5ea490b888898487a63d7a..67a64bba9944c0c87e7141469c460b7c4626e75f 100644
index 668c0ee8936377e31152a0bdc08056c783da3c79..eb77f7f0c5c7706cc5025ecc8018fe27f480dd6a 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3093,9 +3093,10 @@ public abstract class EntityLiving extends Entity {
@@ -3099,9 +3099,10 @@ public abstract class EntityLiving extends Entity {
this.b(this.activeItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
@ -20,7 +20,7 @@ index 4a67a78bbb7b633dcf5ea490b888898487a63d7a..67a64bba9944c0c87e7141469c460b7c
world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -3109,6 +3110,13 @@ public abstract class EntityLiving extends Entity {
@@ -3115,6 +3116,13 @@ public abstract class EntityLiving extends Entity {
} else {
itemstack = this.activeItem.a(this.world, this);
}
@ -34,7 +34,7 @@ index 4a67a78bbb7b633dcf5ea490b888898487a63d7a..67a64bba9944c0c87e7141469c460b7c
// CraftBukkit end
if (itemstack != this.activeItem) {
@@ -3116,6 +3124,11 @@ public abstract class EntityLiving extends Entity {
@@ -3122,6 +3130,11 @@ public abstract class EntityLiving extends Entity {
}
this.clearActiveItem();

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

@ -5,10 +5,10 @@ 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 67a64bba9944c0c87e7141469c460b7c4626e75f..f9ae19f6997631c72afb6014cbec271f8e5bc3e9 100644
index eb77f7f0c5c7706cc5025ecc8018fe27f480dd6a..e011051946ffcff17fd8fd24d49e7f204da41bfd 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -603,7 +603,13 @@ public abstract class EntityLiving extends Entity {
@@ -609,7 +609,13 @@ public abstract class EntityLiving extends Entity {
@Override
public void loadData(NBTTagCompound nbttagcompound) {
@ -23,7 +23,7 @@ index 67a64bba9944c0c87e7141469c460b7c4626e75f..f9ae19f6997631c72afb6014cbec271f
if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isClientSide) {
this.getAttributeMap().a(nbttagcompound.getList("Attributes", 10));
}
@@ -1052,6 +1058,10 @@ public abstract class EntityLiving extends Entity {
@@ -1058,6 +1064,10 @@ public abstract class EntityLiving extends Entity {
}
public void setHealth(float f) {
@ -34,7 +34,7 @@ index 67a64bba9944c0c87e7141469c460b7c4626e75f..f9ae19f6997631c72afb6014cbec271f
// CraftBukkit start - Handle scaled health
if (this instanceof EntityPlayer) {
org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
@@ -2933,7 +2943,7 @@ public abstract class EntityLiving extends Entity {
@@ -2939,7 +2949,7 @@ public abstract class EntityLiving extends Entity {
}
public void setAbsorptionHearts(float f) {
@ -44,7 +44,7 @@ index 67a64bba9944c0c87e7141469c460b7c4626e75f..f9ae19f6997631c72afb6014cbec271f
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3eb7efc728cb64453348bbdabd8ecbb465dfddcd..a8b0bfe18c88ff14fa285cbf2f0da7713f20d0cc 100644
index f55b9a7d118d6433d7de609541aa45228f174e13..a7c91d3e5a4bab8eefb291a90b0752fe7c1fb6ec 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1630,6 +1630,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
Spigot-Server-Patches/0091-EntityRegainHealthEvent-isFastRegen-API.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
Don't even get me started
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index f9ae19f6997631c72afb6014cbec271f8e5bc3e9..a67f6d3bf22c7f59a87ab2340a0a9a6c162f5364 100644
index e011051946ffcff17fd8fd24d49e7f204da41bfd..8365987a845fc23fdad99e101df5b5154d555bbb 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1031,10 +1031,16 @@ public abstract class EntityLiving extends Entity {
@@ -1037,10 +1037,16 @@ public abstract class EntityLiving extends Entity {
}
public void heal(float f, EntityRegainHealthEvent.RegainReason regainReason) {

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 92edb4474167fa95fd36ae9ef86a9eafd29f9b23..703267fe8a9b5e9d49d3b2dbe1da93def15d1b54 100644
index 4f9b286c20a87006f58071b55d78cda946f53c67..06ad9a788194b796ea07cac0c9813c661ea7c9a6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2675,6 +2675,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2677,6 +2677,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean bV() {

4
Spigot-Server-Patches/0128-Add-API-methods-to-control-if-armour-stands-can-move.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add API methods to control if armour stands can move
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 12eba34f647f9ac1d3866cf6a127e928ac245c84..41aedbbe52761f79512a0676b096a1f8a9a49396 100644
index 6aaa4f6f519a4438cdde64c2246b364efa078904..7f002225887f41829f85afcae021aff6cc3dfc9f 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -45,6 +45,7 @@ public class EntityArmorStand extends EntityLiving {
@ -16,7 +16,7 @@ index 12eba34f647f9ac1d3866cf6a127e928ac245c84..41aedbbe52761f79512a0676b096a1f8
public EntityArmorStand(EntityTypes<? extends EntityArmorStand> entitytypes, World world) {
super(entitytypes, world);
@@ -821,4 +822,13 @@ public class EntityArmorStand extends EntityLiving {
@@ -828,4 +829,13 @@ public class EntityArmorStand extends EntityLiving {
private EntitySize s(boolean flag) {
return flag ? EntityArmorStand.bp : (this.isBaby() ? EntityArmorStand.bq : this.getEntityType().l());
}

4
Spigot-Server-Patches/0136-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
View File

@ -173,10 +173,10 @@ index fef00b46e7cf3690044059f9ee527f799d535b81..a7bbf21e9736a0da38f95d93b013097b
// CraftBukkit end
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index a67f6d3bf22c7f59a87ab2340a0a9a6c162f5364..3c36b6ea1d130a150afb4116d18af93de9236cad 100644
index 8365987a845fc23fdad99e101df5b5154d555bbb..af460b43984c36475d99785a1b78a3db6b3fd1d9 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1488,7 +1488,8 @@ public abstract class EntityLiving extends Entity {
@@ -1494,7 +1494,8 @@ public abstract class EntityLiving extends Entity {
int j = EntityExperienceOrb.getOrbValue(i);
i -= j;

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 170dad8be525b40d764b6e63c981f7b73775a01b..97abed1cede09624748e40331a15a021939568be 100644
index 265c583ed68a9acb87d2c2e1eb9786c5f74847ab..90d2509865f5b43eb9061023a6315ac6e4f83faf 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 170dad8be525b40d764b6e63c981f7b73775a01b..97abed1cede09624748e40331a15a021
// Spigot end
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 3c36b6ea1d130a150afb4116d18af93de9236cad..1b23da5c34704bbc00dd050bdf418a937002d784 100644
index af460b43984c36475d99785a1b78a3db6b3fd1d9..8698cecf89ce509c2fc729e0e564c01e253e2b14 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2791,8 +2791,11 @@ public abstract class EntityLiving extends Entity {
@@ -2797,8 +2797,11 @@ public abstract class EntityLiving extends Entity {
}
}

6
Spigot-Server-Patches/0140-Do-not-let-armorstands-drown.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Do not let armorstands drown
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 41aedbbe52761f79512a0676b096a1f8a9a49396..96c229e5dd214d32478fe4d5b96e77d8ba2bc93c 100644
index 7f002225887f41829f85afcae021aff6cc3dfc9f..b0847b4e61e587a47fd209eb2ec3772d1486802d 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -830,5 +830,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -837,5 +837,10 @@ public class EntityArmorStand extends EntityLiving {
super.move(moveType, vec3d);
}
}
@ -20,7 +20,7 @@ index 41aedbbe52761f79512a0676b096a1f8a9a49396..96c229e5dd214d32478fe4d5b96e77d8
// Paper end
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 1b23da5c34704bbc00dd050bdf418a937002d784..f52c2faa42c45d1d8acf7002c306a7de3aadcb86 100644
index 8698cecf89ce509c2fc729e0e564c01e253e2b14..91d5dc2aac5cf487db1a52b4b471a4781178cc37 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -245,6 +245,7 @@ public abstract class EntityLiving extends Entity {

4
Spigot-Server-Patches/0152-Shoulder-Entities-Release-API.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Shoulder Entities Release API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 980484baae997832dafa55a54e4a658507a05803..ca33de2d305487f0f2f50e14f5878c05e1c9845c 100644
index f17bd192dc26878ec0979b6812477a96a7f02607..8b95cb878bd9e294d9c25d1e1c1331f1802118c3 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1783,20 +1783,44 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1790,20 +1790,44 @@ public abstract class EntityHuman extends EntityLiving {
}

6
Spigot-Server-Patches/0155-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 97abed1cede09624748e40331a15a021939568be..ef3fb476615fe6a3aafdf5aebcf5680bfaa62e49 100644
index 90d2509865f5b43eb9061023a6315ac6e4f83faf..508601b29c1f10ffabcf414d97189f5cd8c0a3af 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
@ -49,10 +49,10 @@ index 259713339217660e8b81a9500f57c6995ea59dde..8eb20c6b9a88d5d4056f91df1f496d3d
if (org.bukkit.craftbukkit.event.CraftEventFactory.callSpawnerSpawnEvent(entity, blockposition).isCancelled()) {
Entity vehicle = entity.getVehicle();
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 0bce938a1db4ea11d4ed647530d6c44ec9dbe975..a7d8b2e4a60818f9bfdc42fb1277f7860c6bda2a 100644
index baa54065500b98e3fabce053ad659b44d0a200ff..e3c66d45720e90dbd552c2aedfb4d96fb1639799 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1082,5 +1082,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1087,5 +1087,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
Location origin = getHandle().origin;
return origin == null ? null : origin.clone();
}

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 2fe60df578ad7d6087ae86759f22421a25e5258d..0bfc3a7a532a166497eff75ed355f05c96e216c4 100644
index 4a58909e83e3b0c032143e7466a736e8a670cdf2..699d1ed5ccf4803c727c9c8dc1be2759468cd1ce 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 2fe60df578ad7d6087ae86759f22421a25e5258d..0bfc3a7a532a166497eff75ed355f05c
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -2534,6 +2535,13 @@ public abstract class EntityLiving extends Entity {
@@ -2540,6 +2541,13 @@ public abstract class EntityLiving extends Entity {
ItemStack itemstack1 = this.getEquipment(enumitemslot);
if (!ItemStack.matches(itemstack1, itemstack)) {

4
Spigot-Server-Patches/0221-Fix-CraftEntity-hashCode.patch
View File

@ -21,10 +21,10 @@ check is essentially the same as this.getHandle() == other.getHandle()
However, replaced it too to make it clearer of intent.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index a7d8b2e4a60818f9bfdc42fb1277f7860c6bda2a..fbceb6fde3dc33f3980bb26b8a8bb0bff0263c24 100644
index e3c66d45720e90dbd552c2aedfb4d96fb1639799..018eea17881feeb6583a5b1ae2ab0795e962095b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -740,14 +740,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -745,14 +745,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return false;
}
final CraftEntity other = (CraftEntity) obj;

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 0bfc3a7a532a166497eff75ed355f05c96e216c4..5ecb82078f884946e83a15b254196e39986b7424 100644
index 699d1ed5ccf4803c727c9c8dc1be2759468cd1ce..134da62b90b7a167cd580680a986dd470a3b9aad 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3199,7 +3199,7 @@ public abstract class EntityLiving extends Entity {
@@ -3205,7 +3205,7 @@ public abstract class EntityLiving extends Entity {
if (this.isHandRaised() && !this.activeItem.isEmpty()) {
Item item = this.activeItem.getItem();
@ -31,7 +31,7 @@ index 0bfc3a7a532a166497eff75ed355f05c96e216c4..5ecb82078f884946e83a15b254196e39
} else {
return false;
}
@@ -3455,4 +3455,15 @@ public abstract class EntityLiving extends Entity {
@@ -3461,4 +3461,15 @@ public abstract class EntityLiving extends Entity {
public void broadcastItemBreak(EnumHand enumhand) {
this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND);
}

6
Spigot-Server-Patches/0226-PlayerReadyArrowEvent.patch
View File

@ -7,10 +7,10 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
Plugins can skip selection of certain arrows and control which is used.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index d340ec2fed8a4308d1fd2e998e6716e42d84fb98..bd031108edadd98050bcfe5bc9f702600bde266b 100644
index ac9a5559cff62f49735055afc45ceb75428c69e8..88a23d3e8f251304f22818b8c65590c39c42cd80 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -2044,6 +2044,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -2051,6 +2051,17 @@ public abstract class EntityHuman extends EntityLiving {
return ImmutableList.of(EntityPose.STANDING, EntityPose.CROUCHING, EntityPose.SWIMMING);
}
@ -28,7 +28,7 @@ index d340ec2fed8a4308d1fd2e998e6716e42d84fb98..bd031108edadd98050bcfe5bc9f70260
@Override
public ItemStack f(ItemStack itemstack) {
if (!(itemstack.getItem() instanceof ItemProjectileWeapon)) {
@@ -2060,7 +2071,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -2067,7 +2078,7 @@ public abstract class EntityHuman extends EntityLiving {
for (int i = 0; i < this.inventory.getSize(); ++i) {
ItemStack itemstack2 = this.inventory.getItem(i);

12
Spigot-Server-Patches/0227-Implement-EntityKnockbackByEntityEvent.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent
This event is called when an entity receives knockback by another entity.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index bd031108edadd98050bcfe5bc9f702600bde266b..cbffebfe323ff4ddec792c49ebc3391fc9ac35ac 100644
index 88a23d3e8f251304f22818b8c65590c39c42cd80..e59d54755542b9053e64618495a3fa79cb084915 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1080,7 +1080,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -41,10 +41,10 @@ index 1b0c4234cf579b35f404c129c2c6d3266b670b09..38bf49da2cc6b2f7068462ea8b57cf3a
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 5ecb82078f884946e83a15b254196e39986b7424..a962f695f3f3508f8ce32f72a56990eb0e601589 100644
index 134da62b90b7a167cd580680a986dd470a3b9aad..991839c39206ec984c442776693afdf50f90b409 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1240,7 +1240,7 @@ public abstract class EntityLiving extends Entity {
@@ -1246,7 +1246,7 @@ public abstract class EntityLiving extends Entity {
}
this.ap = (float) (MathHelper.d(d1, d0) * 57.2957763671875D - (double) this.yaw);
@ -53,7 +53,7 @@ index 5ecb82078f884946e83a15b254196e39986b7424..a962f695f3f3508f8ce32f72a56990eb
} else {
this.ap = (float) ((int) (Math.random() * 2.0D) * 180);
}
@@ -1288,7 +1288,7 @@ public abstract class EntityLiving extends Entity {
@@ -1294,7 +1294,7 @@ public abstract class EntityLiving extends Entity {
}
protected void e(EntityLiving entityliving) {
@ -62,7 +62,7 @@ index 5ecb82078f884946e83a15b254196e39986b7424..a962f695f3f3508f8ce32f72a56990eb
}
private boolean f(DamageSource damagesource) {
@@ -1524,6 +1524,11 @@ public abstract class EntityLiving extends Entity {
@@ -1530,6 +1530,11 @@ public abstract class EntityLiving extends Entity {
}
public void a(float f, double d0, double d1) {
@ -74,7 +74,7 @@ index 5ecb82078f884946e83a15b254196e39986b7424..a962f695f3f3508f8ce32f72a56990eb
f = (float) ((double) f * (1.0D - this.b(GenericAttributes.KNOCKBACK_RESISTANCE)));
if (f > 0.0F) {
this.impulse = true;
@@ -1531,6 +1536,16 @@ public abstract class EntityLiving extends Entity {
@@ -1537,6 +1542,16 @@ public abstract class EntityLiving extends Entity {
Vec3D vec3d1 = (new Vec3D(d0, 0.0D, d1)).d().a((double) f);
this.setMot(vec3d.x / 2.0D - vec3d1.x, this.onGround ? Math.min(0.4D, vec3d.y / 2.0D + (double) f) : vec3d.y, vec3d.z / 2.0D - vec3d1.z);

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 a962f695f3f3508f8ce32f72a56990eb0e601589..51d1d9abcb66bef329fa2396e9e338b9d962733b 100644
index 991839c39206ec984c442776693afdf50f90b409..97c0cc10d30a299a95e019f59bfcbbff176455ab 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 a962f695f3f3508f8ce32f72a56990eb0e601589..51d1d9abcb66bef329fa2396e9e338b9
protected int bd;
protected int be;
private BlockPosition bx;
@@ -3182,10 +3182,12 @@ public abstract class EntityLiving extends Entity {
@@ -3188,10 +3188,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 ef3fb476615fe6a3aafdf5aebcf5680bfaa62e49..07941c987a0c644e896f49ce217c1c625dc25014 100644
index 508601b29c1f10ffabcf414d97189f5cd8c0a3af..2c3474c9a25fb8c5da8d3c8254c5865b10a8cf4f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2437,7 +2437,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2439,7 +2439,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public String toString() {

4
Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
View File

@ -19,10 +19,10 @@ index 6e7e00678295b5b714a1be4753626e21ab469fd6..54d7f6efcf42d4c7a8c209dfe3c54853
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 96c229e5dd214d32478fe4d5b96e77d8ba2bc93c..2592a59e9506cee901802a3bdc78db8832700fd8 100644
index b0847b4e61e587a47fd209eb2ec3772d1486802d..89f6525ef1a4c41d3b662a5ad22b353064a82f36 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -314,6 +314,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -321,6 +321,7 @@ public class EntityArmorStand extends EntityLiving {
@Override
protected void collideNearby() {

4
Spigot-Server-Patches/0254-Implement-Expanded-ArmorStand-API.patch
View File

@ -8,10 +8,10 @@ Add the following:
- Enable/Disable slot interactions
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 2592a59e9506cee901802a3bdc78db8832700fd8..9b71e3207b0f41ab34871d5f4d7e87d90bc6446d 100644
index 89f6525ef1a4c41d3b662a5ad22b353064a82f36..8922c656617bd8aed5b68f671d5191a537695bdf 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -388,6 +388,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -395,6 +395,7 @@ public class EntityArmorStand extends EntityLiving {
return enumitemslot;
}

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

@ -20,7 +20,7 @@ index 54d7f6efcf42d4c7a8c209dfe3c5485318afafe3..5ea60c713426f11e420360a08a9ea103
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 9b71e3207b0f41ab34871d5f4d7e87d90bc6446d..4e6f195965af2108631f373a3a2987826e4317de 100644
index 8922c656617bd8aed5b68f671d5191a537695bdf..8021d06b7765ad00abdbd8b77c37f7a80cb15803 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -46,9 +46,16 @@ public class EntityArmorStand extends EntityLiving {
@ -40,7 +40,7 @@ index 9b71e3207b0f41ab34871d5f4d7e87d90bc6446d..4e6f195965af2108631f373a3a298782
this.handItems = NonNullList.a(2, ItemStack.b);
this.armorItems = NonNullList.a(4, ItemStack.b);
this.headPose = EntityArmorStand.bj;
@@ -137,6 +144,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -144,6 +151,7 @@ public class EntityArmorStand extends EntityLiving {
this.armorItems.set(enumitemslot.b(), itemstack);
}
@ -48,7 +48,7 @@ index 9b71e3207b0f41ab34871d5f4d7e87d90bc6446d..4e6f195965af2108631f373a3a298782
}
@Override
@@ -217,6 +225,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -224,6 +232,7 @@ public class EntityArmorStand extends EntityLiving {
}
nbttagcompound.set("Pose", this.B());
@ -56,7 +56,7 @@ index 9b71e3207b0f41ab34871d5f4d7e87d90bc6446d..4e6f195965af2108631f373a3a298782
}
@Override
@@ -248,6 +257,12 @@ public class EntityArmorStand extends EntityLiving {
@@ -255,6 +264,12 @@ public class EntityArmorStand extends EntityLiving {
this.setBasePlate(nbttagcompound.getBoolean("NoBasePlate"));
this.setMarker(nbttagcompound.getBoolean("Marker"));
this.noclip = !this.A();
@ -69,7 +69,7 @@ index 9b71e3207b0f41ab34871d5f4d7e87d90bc6446d..4e6f195965af2108631f373a3a298782
NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("Pose");
this.g(nbttagcompound1);
@@ -603,7 +618,29 @@ public class EntityArmorStand extends EntityLiving {
@@ -610,7 +625,29 @@ public class EntityArmorStand extends EntityLiving {
@Override
public void tick() {
@ -99,7 +99,7 @@ index 9b71e3207b0f41ab34871d5f4d7e87d90bc6446d..4e6f195965af2108631f373a3a298782
Vector3f vector3f = (Vector3f) this.datawatcher.get(EntityArmorStand.c);
if (!this.headPose.equals(vector3f)) {
@@ -726,29 +763,36 @@ public class EntityArmorStand extends EntityLiving {
@@ -733,29 +770,36 @@ public class EntityArmorStand extends EntityLiving {
public void setHeadPose(Vector3f vector3f) {
this.headPose = vector3f;
this.datawatcher.set(EntityArmorStand.c, vector3f);
@ -137,10 +137,10 @@ index 9b71e3207b0f41ab34871d5f4d7e87d90bc6446d..4e6f195965af2108631f373a3a298782
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 51d1d9abcb66bef329fa2396e9e338b9d962733b..83d98b705875fa543de4f37b1234ad65e4e0604a 100644
index 97c0cc10d30a299a95e019f59bfcbbff176455ab..57395c71ce8e6c1b0246ca9bd7bf7f688e770d15 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2514,6 +2514,7 @@ public abstract class EntityLiving extends Entity {
@@ -2520,6 +2520,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 83d98b705875fa543de4f37b1234ad65e4e0604a..99dac0a315c29dd394ea3e8049da89c62ace65cc 100644
index 57395c71ce8e6c1b0246ca9bd7bf7f688e770d15..4f80d94629ffba2960916628ccd9b53f08365612 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3474,6 +3474,23 @@ public abstract class EntityLiving extends Entity {
@@ -3480,6 +3480,23 @@ public abstract class EntityLiving extends Entity {
this.broadcastItemBreak(enumhand == EnumHand.MAIN_HAND ? EnumItemSlot.MAINHAND : EnumItemSlot.OFFHAND);
}
// Paper start

6
Spigot-Server-Patches/0278-Expose-attack-cooldown-methods-for-Player.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 73a33eff97d26e5b3542d787344013e18e52db68..6a46b9262ba34febc2664a6f56c186843ed7fb3f 100644
index 6f04a8cf06cf76f433ffcd81d0e41e9b36509948..c0b061f588944b2a9a82bea4087c68423c7e22a1 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -2005,6 +2005,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -2012,6 +2012,7 @@ public abstract class EntityHuman extends EntityLiving {
this.datawatcher.set(EntityHuman.bl, nbttagcompound);
}
@ -17,7 +17,7 @@ index 73a33eff97d26e5b3542d787344013e18e52db68..6a46b9262ba34febc2664a6f56c18684
return (float) (1.0D / this.b(GenericAttributes.ATTACK_SPEED) * 20.0D);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 0a9e4dd47660748a80c40a2790ee197ceeb346b0..0f3fd7baf158923b30380eaa4be1c24114a8bd51 100644
index c04ad85d16ce358dfbd72d1d84fb39970aa6aef0..27fa6f5c2e806da2bef12fb7ffbb0f9e90725594 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1993,6 +1993,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

26
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 b2cccdc9f2f243cd3fb1283ade0280b2acb0f772..4923fe299e7f057d5d70d346e83e746185eafdd3 100644
index 05c4d335397c39f44ebff705f694ea660f7142f5..2068f0630d947d36037cb3f4e472235051240110 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 b2cccdc9f2f243cd3fb1283ade0280b2acb0f772..4923fe299e7f057d5d70d346e83e7461
public void a(Entity entity, int i, DamageSource damagesource) {
if (entity instanceof EntityPlayer) {
CriterionTriggers.c.a((EntityPlayer) entity, this, damagesource);
@@ -2351,6 +2352,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2353,6 +2354,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.fallDistance = 0.0F;
}
@ -47,10 +47,10 @@ index b2cccdc9f2f243cd3fb1283ade0280b2acb0f772..4923fe299e7f057d5d70d346e83e7461
protected void l(double d0, double d1, double d2) {
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 4e6f195965af2108631f373a3a2987826e4317de..01c0ec114cf913e54058a2f5298807dbb83d1cf4 100644
index 8021d06b7765ad00abdbd8b77c37f7a80cb15803..7a061f1f072f57042bb32ff187b0f916545e2e48 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -704,7 +704,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -711,7 +711,8 @@ public class EntityArmorStand extends EntityLiving {
@Override
public void killEntity() {
@ -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 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9b3d38b40 100644
index 4f80d94629ffba2960916628ccd9b53f08365612..c0e7d10955ea7f0df4025491a18ab3040ea25437 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 {
@ -139,7 +139,7 @@ index 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9
@Override
public float getBukkitYaw() {
@@ -1249,13 +1250,17 @@ public abstract class EntityLiving extends Entity {
@@ -1255,13 +1256,17 @@ public abstract class EntityLiving extends Entity {
if (knockbackCancelled) this.world.broadcastEntityEffect(this, (byte) 2); // Paper - Disable explosion knockback
if (this.dl()) {
if (!this.f(damagesource)) {
@ -161,7 +161,7 @@ index 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9
}
} else if (flag1) {
this.c(damagesource);
@@ -1394,6 +1399,7 @@ public abstract class EntityLiving extends Entity {
@@ -1400,6 +1405,7 @@ public abstract class EntityLiving extends Entity {
Entity entity = damagesource.getEntity();
EntityLiving entityliving = this.getKillingEntity();
@ -169,7 +169,7 @@ index 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9
if (this.aO >= 0 && entityliving != null) {
entityliving.a(this, this.aO, damagesource);
}
@@ -1401,20 +1407,40 @@ public abstract class EntityLiving extends Entity {
@@ -1407,20 +1413,40 @@ public abstract class EntityLiving extends Entity {
if (this.isSleeping()) {
this.entityWakeup();
}
@ -213,7 +213,7 @@ index 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9
}
}
@@ -1422,7 +1448,7 @@ public abstract class EntityLiving extends Entity {
@@ -1428,7 +1454,7 @@ public abstract class EntityLiving extends Entity {
if (!this.world.isClientSide) {
boolean flag = false;
@ -222,7 +222,7 @@ index 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9
if (this.world.getGameRules().getBoolean(GameRules.MOB_GRIEFING)) {
BlockPosition blockposition = this.getChunkCoordinates();
IBlockData iblockdata = Blocks.WITHER_ROSE.getBlockData();
@@ -1443,7 +1469,8 @@ public abstract class EntityLiving extends Entity {
@@ -1449,7 +1475,8 @@ public abstract class EntityLiving extends Entity {
}
}
@ -232,7 +232,7 @@ index 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9
Entity entity = damagesource.getEntity();
int i;
@@ -1461,15 +1488,18 @@ public abstract class EntityLiving extends Entity {
@@ -1467,15 +1494,18 @@ public abstract class EntityLiving extends Entity {
this.dropDeathLoot(damagesource, i, flag);
}
// CraftBukkit start - Call death event
@ -252,7 +252,7 @@ index 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9
// CraftBukkit start
public int getExpReward() {
@@ -1554,6 +1584,7 @@ public abstract class EntityLiving extends Entity {
@@ -1560,6 +1590,7 @@ public abstract class EntityLiving extends Entity {
return SoundEffects.ENTITY_GENERIC_HURT;
}
@ -260,7 +260,7 @@ index 99dac0a315c29dd394ea3e8049da89c62ace65cc..81e41ec85160eeef833824821d797db9
@Nullable
protected SoundEffect getSoundDeath() {
return SoundEffects.ENTITY_GENERIC_DEATH;
@@ -2084,10 +2115,12 @@ public abstract class EntityLiving extends Entity {
@@ -2090,10 +2121,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 4923fe299e7f057d5d70d346e83e746185eafdd3..470f8f1440c62b30a9df6cf356003dd35a69ee46 100644
index 2068f0630d947d36037cb3f4e472235051240110..c488db132f80156db95d98a9b094d0352a46be2d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2264,6 +2264,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2266,6 +2266,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}

8
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 470f8f1440c62b30a9df6cf356003dd35a69ee46..ea0525ca0b52b3270b868cc8a526c7139baa4db8 100644
index c488db132f80156db95d98a9b094d0352a46be2d..6e5af77467f7fdf36a2af86399eef54bb8f15a24 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
@ -72,7 +72,7 @@ index 470f8f1440c62b30a9df6cf356003dd35a69ee46..ea0525ca0b52b3270b868cc8a526c713
if (this.valid) {
Bukkit.getPluginManager().callEvent(event);
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 6a46b9262ba34febc2664a6f56c186843ed7fb3f..21bace17c7cac0b895ac1ab16ae43bb207a725ab 100644
index c0b061f588944b2a9a82bea4087c68423c7e22a1..14e3496f6f382e8f259f5b55be43b3c2eb4616f3 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -942,9 +942,11 @@ public abstract class EntityHuman extends EntityLiving {
@ -91,10 +91,10 @@ index 6a46b9262ba34febc2664a6f56c186843ed7fb3f..21bace17c7cac0b895ac1ab16ae43bb2
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 81e41ec85160eeef833824821d797db9b3d38b40..eaaef11527bc325d6cd6d3b1bc24c59eb8f5ba95 100644
index c0e7d10955ea7f0df4025491a18ab3040ea25437..c3cb6ac7e7ab05f208f43a63d733f760098e46c1 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2904,11 +2904,13 @@ public abstract class EntityLiving extends Entity {
@@ -2910,11 +2910,13 @@ public abstract class EntityLiving extends Entity {
return ((Byte) this.datawatcher.get(EntityLiving.ag) & 4) != 0;
}

8
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 ea0525ca0b52b3270b868cc8a526c7139baa4db8..f999920fcc61109d2359ada18fb4272e25c2fcc7 100644
index 6e5af77467f7fdf36a2af86399eef54bb8f15a24..9384cd901f934c41dcfadde29561fadfa0e523f8 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 ea0525ca0b52b3270b868cc8a526c7139baa4db8..f999920fcc61109d2359ada18fb4272e
return 0.0F;
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index eaaef11527bc325d6cd6d3b1bc24c59eb8f5ba95..e6f91f875a063a2438ddce3aee1f0a92abe4d11a 100644
index c3cb6ac7e7ab05f208f43a63d733f760098e46c1..6e3fb6c7da3195496c7978eb8cd8ccc905fcd3ef 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3526,6 +3526,37 @@ public abstract class EntityLiving extends Entity {
@@ -3532,6 +3532,37 @@ public abstract class EntityLiving extends Entity {
return world.rayTrace(raytrace);
}
@ -108,7 +108,7 @@ index eaaef11527bc325d6cd6d3b1bc24c59eb8f5ba95..e6f91f875a063a2438ddce3aee1f0a92
public int getShieldBlockingDelay() {
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index ff1ddb4db5406f81453a8f075033d00e06bce6a5..5319ee9314f23b3323015efc40ad8a0287ad6368 100644
index 863f4464c688912b3e0ce61cbbbf263e38a3af4b..3d54b7a4bf102dfc568e782706f67e4b5269eaf1 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -17,6 +17,7 @@ public final class IEntitySelector {

6
Spigot-Server-Patches/0336-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 f999920fcc61109d2359ada18fb4272e25c2fcc7..073660a67ece962981b388a8b0f5402ce2a430c6 100644
index 9384cd901f934c41dcfadde29561fadfa0e523f8..14c2929d0ed0dcbd22a7efd310c2da9d9ccbe09a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -96,10 +96,10 @@ index c8a990ab5db73b9e13b60b55f10142fe20e8179a..36929d3220e305ffed9eb52e5e000a51
if (entity.valid) {
MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index fbceb6fde3dc33f3980bb26b8a8bb0bff0263c24..43e9181ea50b1db2fae4645d702e64b3d2157113 100644
index 018eea17881feeb6583a5b1ae2ab0795e962095b..e2d4aa9ba7fa007b3d93a166c5fb57c8a90387ed 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1088,5 +1088,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1093,5 +1093,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public boolean fromMobSpawner() {
return getHandle().spawnedViaMobSpawner;
}

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

@ -81,7 +81,7 @@ index 6f410120018f95259e9e4f504ea1b588c2b4622b..a9a3dbbe7608d1f0dc122fe8d49928e7
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 6154f7a7973168cbe294bc0f40894f05bf20513e..0f8745ede62894f8d88fc8985e34b32acee5c698 100644
index e0f1eb19ea1ceebe00a428c753fec13d317869dd..fdd754a06fc6566b448d9847e210e7cd35fccd89 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -502,6 +502,7 @@ public class Chunk implements IChunkAccess {
@ -93,10 +93,10 @@ index 6154f7a7973168cbe294bc0f40894f05bf20513e..0f8745ede62894f8d88fc8985e34b32a
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 073660a67ece962981b388a8b0f5402ce2a430c6..ba18da7b9d069b1d553c2ae8838296351e3358aa 100644
index 14c2929d0ed0dcbd22a7efd310c2da9d9ccbe09a..6929ede827334d58ac91eab30566110acce8a495 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2705,6 +2705,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2707,6 +2707,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
});
}

4
Spigot-Server-Patches/0368-Asynchronous-chunk-IO-and-loading.patch
View File

@ -4094,10 +4094,10 @@ index dd3c24b4de393f4eaca88484ccf94b620fd28bdc..191660c6c3fd7272daec09f8986a3668
// Spigot start
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 43e9181ea50b1db2fae4645d702e64b3d2157113..fdefdef19c5330d022a27ab626d18a8566f37899 100644
index e2d4aa9ba7fa007b3d93a166c5fb57c8a90387ed..666876943675a8c299b414f6b5ea359aac186961 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -503,6 +503,28 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -508,6 +508,28 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
entity.setHeadRotation(yaw);
}

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 e6f91f875a063a2438ddce3aee1f0a92abe4d11a..072fa0ba13bbad5a045cb7fd296fcca160718c8c 100644
index 6e3fb6c7da3195496c7978eb8cd8ccc905fcd3ef..1685478f333a387d270ec4533319b9a62076a9ef 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3089,10 +3089,13 @@ public abstract class EntityLiving extends Entity {
@@ -3095,10 +3095,13 @@ public abstract class EntityLiving extends Entity {
this.datawatcher.set(EntityLiving.ag, (byte) j);
}
@ -24,7 +24,7 @@ index e6f91f875a063a2438ddce3aee1f0a92abe4d11a..072fa0ba13bbad5a045cb7fd296fcca1
this.activeItem = itemstack;
this.bd = itemstack.k();
if (!this.world.isClientSide) {
@@ -3170,6 +3173,7 @@ public abstract class EntityLiving extends Entity {
@@ -3176,6 +3179,7 @@ public abstract class EntityLiving extends Entity {
this.releaseActiveItem();
} else {
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@ -32,7 +32,7 @@ index e6f91f875a063a2438ddce3aee1f0a92abe4d11a..072fa0ba13bbad5a045cb7fd296fcca1
this.b(this.activeItem, 16);
// CraftBukkit start - fire PlayerItemConsumeEvent
ItemStack itemstack;
@@ -3204,8 +3208,8 @@ public abstract class EntityLiving extends Entity {
@@ -3210,8 +3214,8 @@ public abstract class EntityLiving extends Entity {
}
this.clearActiveItem();

4
Spigot-Server-Patches/0384-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch
View File

@ -7,10 +7,10 @@ Fixes an AssertionError when setting the player's item in hand to null or a new
Fixes GH-2718
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 072fa0ba13bbad5a045cb7fd296fcca160718c8c..65187e7ce1e0ba32cc4a7547e570588cad0d22b8 100644
index 1685478f333a387d270ec4533319b9a62076a9ef..44793c443bd8c357832daa5c65cc2230ef031dc2 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2049,6 +2049,7 @@ public abstract class EntityLiving extends Entity {
@@ -2055,6 +2055,7 @@ public abstract class EntityLiving extends Entity {
return predicate.test(this.getItemInMainHand().getItem()) || predicate.test(this.getItemInOffHand().getItem());
}

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 65187e7ce1e0ba32cc4a7547e570588cad0d22b8..f997cda883038edaed55f886fa43ee9053bde888 100644
index 44793c443bd8c357832daa5c65cc2230ef031dc2..dec5eeea9460102dcb552329d90d055cd11c798c 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 65187e7ce1e0ba32cc4a7547e570588cad0d22b8..f997cda883038edaed55f886fa43ee90
protected int be;
private BlockPosition bx;
private Optional<BlockPosition> by;
@@ -3039,6 +3039,11 @@ public abstract class EntityLiving extends Entity {
@@ -3045,6 +3045,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 65187e7ce1e0ba32cc4a7547e570588cad0d22b8..f997cda883038edaed55f886fa43ee90
private void t() {
if (this.isHandRaised()) {
if (ItemStack.d(this.b(this.getRaisedHand()), this.activeItem)) {
@@ -3048,7 +3053,12 @@ public abstract class EntityLiving extends Entity {
@@ -3054,7 +3059,12 @@ public abstract class EntityLiving extends Entity {
this.b(this.activeItem, 5);
}
@ -45,7 +45,7 @@ index 65187e7ce1e0ba32cc4a7547e570588cad0d22b8..f997cda883038edaed55f886fa43ee90
this.s();
}
} else {
@@ -3098,7 +3108,10 @@ public abstract class EntityLiving extends Entity {
@@ -3104,7 +3114,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 65187e7ce1e0ba32cc4a7547e570588cad0d22b8..f997cda883038edaed55f886fa43ee90
if (!this.world.isClientSide) {
this.c(1, true);
this.c(2, enumhand == EnumHand.OFF_HAND);
@@ -3122,7 +3135,10 @@ public abstract class EntityLiving extends Entity {
@@ -3128,7 +3141,10 @@ public abstract class EntityLiving extends Entity {
}
} else if (!this.isHandRaised() && !this.activeItem.isEmpty()) {
this.activeItem = ItemStack.b;
@ -69,7 +69,7 @@ index 65187e7ce1e0ba32cc4a7547e570588cad0d22b8..f997cda883038edaed55f886fa43ee90
}
}
@@ -3250,7 +3266,10 @@ public abstract class EntityLiving extends Entity {
@@ -3256,7 +3272,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 ba18da7b9d069b1d553c2ae8838296351e3358aa..1fa7b82685a5e55d57d78abd5151f20e20178646 100644
index 6929ede827334d58ac91eab30566110acce8a495..c5093aa5ce953384fcd9c27da59d60e30678d376 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 ba18da7b9d069b1d553c2ae8838296351e3358aa..1fa7b82685a5e55d57d78abd5151f20e
public void k(Entity entity) {
this.a(entity, Entity::setPosition);
}
@@ -2723,6 +2733,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2725,6 +2735,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 f997cda883038edaed55f886fa43ee9053bde888..fe88548ff1e63c5c43351dd0dd3bf383cb985409 100644
index dec5eeea9460102dcb552329d90d055cd11c798c..7ecd1f7d4aae0aef429984d32fff708bfc068ee9 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 1fa7b82685a5e55d57d78abd5151f20e20178646..240675705fe52af6326b78ce0e3bf8ec0e8b50e1 100644
index c5093aa5ce953384fcd9c27da59d60e30678d376..4f89a265a449d3ab7bc1073864c38d7a20927148 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2635,6 +2635,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2637,6 +2637,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 fe88548ff1e63c5c43351dd0dd3bf383cb985409..f92d078ab77fd7386586ac05aea1686273b44ee1 100644
index 7ecd1f7d4aae0aef429984d32fff708bfc068ee9..6e96a59e9d0f51d850bf19ee59ad284822a9b576 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2764,8 +2764,10 @@ public abstract class EntityLiving extends Entity {
@@ -2770,8 +2770,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 f92d078ab77fd7386586ac05aea1686273b44ee1..d429ec31346cd0b1d6556afb4f6ff1a09cf55de5 100644
index 6e96a59e9d0f51d850bf19ee59ad284822a9b576..25af1a69317cda73fb93689c899fcee676ff5c95 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2832,10 +2832,16 @@ public abstract class EntityLiving extends Entity {
@@ -2838,10 +2838,16 @@ public abstract class EntityLiving extends Entity {
protected void doTick() {}
protected void collideNearby() {

4
Spigot-Server-Patches/0454-Add-PlayerAttackEntityCooldownResetEvent.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index d429ec31346cd0b1d6556afb4f6ff1a09cf55de5..445e092efc1633638af9db72141cf9a85a3ac268 100644
index 25af1a69317cda73fb93689c899fcee676ff5c95..97696e489413cb93bd12299a886b18152f32f522 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1824,7 +1824,16 @@ public abstract class EntityLiving extends Entity {
@@ -1830,7 +1830,16 @@ public abstract class EntityLiving extends Entity {
EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption);
if (damagesource.getEntity() instanceof EntityHuman) {

16
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 5bec3b9692f64a792e26f89b4147644eaaf4ab11..60dae06ff5c016aecba23afd7a4152fcd3234616 100644
index 4eb37ac65e80569979544c71c71ed192740535a2..c5106449fc0196cdba8ad0325dd0c247e9d9040f 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 5bec3b9692f64a792e26f89b4147644eaaf4ab11..60dae06ff5c016aecba23afd7a4152fc
entityitem.defaultPickupDelay();
// CraftBukkit start
@@ -2532,6 +2533,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2534,6 +2535,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@Nullable
public Entity teleportTo(WorldServer worldserver, BlockPosition location) {
// CraftBukkit end
@ -47,7 +47,7 @@ index 5bec3b9692f64a792e26f89b4147644eaaf4ab11..60dae06ff5c016aecba23afd7a4152fc
if (this.world instanceof WorldServer && !this.dead) {
this.world.getMethodProfiler().enter("changeDimension");
// CraftBukkit start
@@ -2567,7 +2574,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2569,7 +2576,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
entity.bukkitEntity = this.getBukkitEntity();
if (this instanceof EntityInsentient) {
@ -56,7 +56,7 @@ index 5bec3b9692f64a792e26f89b4147644eaaf4ab11..60dae06ff5c016aecba23afd7a4152fc
}
// CraftBukkit end
}
@@ -2687,7 +2694,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2689,7 +2696,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean canPortal() {
@ -66,10 +66,10 @@ index 5bec3b9692f64a792e26f89b4147644eaaf4ab11..60dae06ff5c016aecba23afd7a4152fc
public float a(Explosion explosion, IBlockAccess iblockaccess, BlockPosition blockposition, IBlockData iblockdata, Fluid fluid, float f) {
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 01c0ec114cf913e54058a2f5298807dbb83d1cf4..66597c6e1add4df2f093480f507f03788a3eb30b 100644
index 7a061f1f072f57042bb32ff187b0f916545e2e48..0fd3a7ebddfd22d6640307452f525d1c2aaf4439 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -560,7 +560,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -567,7 +567,7 @@ public class EntityArmorStand extends EntityLiving {
for (i = 0; i < this.handItems.size(); ++i) {
itemstack = (ItemStack) this.handItems.get(i);
if (!itemstack.isEmpty()) {
@ -78,7 +78,7 @@ index 01c0ec114cf913e54058a2f5298807dbb83d1cf4..66597c6e1add4df2f093480f507f0378
this.handItems.set(i, ItemStack.b);
}
}
@@ -568,7 +568,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -575,7 +575,7 @@ public class EntityArmorStand extends EntityLiving {
for (i = 0; i < this.armorItems.size(); ++i) {
itemstack = (ItemStack) this.armorItems.get(i);
if (!itemstack.isEmpty()) {
@ -88,7 +88,7 @@ index 01c0ec114cf913e54058a2f5298807dbb83d1cf4..66597c6e1add4df2f093480f507f0378
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index c86e012931e4112152fbf72dac15fb357ac7f6b0..2fe655e0b7655cc9b4ce1509c6d6cfd51860c006 100644
index 9c67045920efe05c9acba5a40062358255dbfeac..0f19205376fa0948dbba4a18f1bc68a5115cf05f 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -811,7 +811,8 @@ public class CraftEventFactory {

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

10
Spigot-Server-Patches/0521-Add-entity-liquid-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add entity liquid API
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 422b82f15c323f504458a1fdcd5cf7018ab53468..6aeea48d4cf4732f6a5a5dba12af873c2aee493b 100644
index ded88464d102679423ac69d8a6c3cf4ba6fc516f..bf0ef3998ff5dd71d3d6489184ece7fdce8afdd5 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1075,12 +1075,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -40,18 +40,14 @@ index 422b82f15c323f504458a1fdcd5cf7018ab53468..6aeea48d4cf4732f6a5a5dba12af873c
return !this.justCreated && this.M.getDouble(TagsFluid.LAVA) > 0.0D;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index fdefdef19c5330d022a27ab626d18a8566f37899..2ca79b3e9b3418a2a8dd8ee9e3fb9d41aec1e43c 100644
index 666876943675a8c299b414f6b5ea359aac186961..c7636ffc952c436d7148e6e5926b0108cc628821 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1115,5 +1115,33 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1120,5 +1120,29 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason() {
return getHandle().spawnReason;
}
+
+ public boolean isInWater() {
+ return getHandle().isInWater();
+ }
+
+ public boolean isInRain() {
+ return getHandle().isInRain();
+ }

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 445e092efc1633638af9db72141cf9a85a3ac268..fe0334b505de64ae1d96c4f0b6e66313d2b40010 100644
index 97696e489413cb93bd12299a886b18152f32f522..df66083880e8416d2ddb3ec5ef0290a489929942 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2929,7 +2929,7 @@ public abstract class EntityLiving extends Entity {
@@ -2935,7 +2935,7 @@ public abstract class EntityLiving extends Entity {
Entity entity = this.getVehicle();
super.stopRiding(suppressCancellation); // Paper - suppress

6
Spigot-Server-Patches/0569-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch
View File

@ -9,7 +9,7 @@ as this is how Vanilla teleports entities.
Cancel any pending motion when teleported.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 6aeea48d4cf4732f6a5a5dba12af873c2aee493b..fa0256a99c833e6035b8d3e873a93af2b674ef52 100644
index bf0ef3998ff5dd71d3d6489184ece7fdce8afdd5..1f73ffbdd5b1b5906573ca4ba5c16a4f31b4c79a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -54,6 +54,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -57,10 +57,10 @@ index 8a4a7888089a10416fc0cf88007b7a958e903a4c..c0524ff9f49dffa4010bdeef301c0d7a
this.player.playerConnection.sendPacket(new PacketPlayOutPosition(d0 - d3, d1 - d4, d2 - d5, f - f2, f1 - f3, set, this.teleportAwait));
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 2ca79b3e9b3418a2a8dd8ee9e3fb9d41aec1e43c..f1243b308e44d7c08e007d8ce080c2fc6248753c 100644
index c7636ffc952c436d7148e6e5926b0108cc628821..582ed13a9ba1748444ce4d624d83a4d7be7006f2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -549,7 +549,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -554,7 +554,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
// entity.setLocation() throws no event, and so cannot be cancelled

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 fa0256a99c833e6035b8d3e873a93af2b674ef52..53fb4f04087c091f3354e74d6b94554601f2cbe0 100644
index 1f73ffbdd5b1b5906573ca4ba5c16a4f31b4c79a..cfc6e127257340333a666c826f3a0b77f83eea33 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3375,4 +3375,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3377,4 +3377,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
void accept(Entity entity, double d0, double d1, double d2);
}

8
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 53fb4f04087c091f3354e74d6b94554601f2cbe0..d86b67a63b37569fc4ca69ec04305a330950b0f2 100644
index cfc6e127257340333a666c826f3a0b77f83eea33..6e0585bfe6ef371a93e6a99475233de7f08d2634 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3380,5 +3380,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3382,5 +3382,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public static int nextEntityId() {
return entityCount.incrementAndGet();
}
@ -19,10 +19,10 @@ index 53fb4f04087c091f3354e74d6b94554601f2cbe0..d86b67a63b37569fc4ca69ec04305a33
// Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index f1243b308e44d7c08e007d8ce080c2fc6248753c..4ec0e9220d2fa976dc6dfecd3eedb5b78a0ef8f4 100644
index 582ed13a9ba1748444ce4d624d83a4d7be7006f2..475dc1aa2cba77c13033938e719a66707f358914 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1143,5 +1143,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1144,5 +1144,9 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public boolean isInLava() {
return getHandle().isInLava();
}

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 d86b67a63b37569fc4ca69ec04305a330950b0f2..0c952fea30aa6890809d728420e4710d95e10c19 100644
index 6e0585bfe6ef371a93e6a99475233de7f08d2634..959848eba4900ece787373a3af201be8c6323ca2 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3078,7 +3078,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3080,7 +3080,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public Stream<Entity> cp() {

12
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 0c952fea30aa6890809d728420e4710d95e10c19..e44e5652c12fbee51acedc1f911181b8443fae93 100644
index 959848eba4900ece787373a3af201be8c6323ca2..091d55c04c663df07c69f637515f53990c3c2d46 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
@ -36,10 +36,10 @@ index 0c952fea30aa6890809d728420e4710d95e10c19..e44e5652c12fbee51acedc1f911181b8
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 66597c6e1add4df2f093480f507f03788a3eb30b..8fef94ad9ac795311fb083a384ed98f1ea860f0a 100644
index 0fd3a7ebddfd22d6640307452f525d1c2aaf4439..d6de166babe2e25a88f9e6dae462907e26b6fb6f 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -320,7 +320,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -327,7 +327,7 @@ public class EntityArmorStand extends EntityLiving {
}
@Override
@ -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 fe0334b505de64ae1d96c4f0b6e66313d2b40010..b88bd19fc3ebaf3ae467b5ad35a155505db77e6c 100644
index df66083880e8416d2ddb3ec5ef0290a489929942..53d193fab101192ee0e0a5519b78c354122db353 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 fe0334b505de64ae1d96c4f0b6e66313d2b40010..b88bd19fc3ebaf3ae467b5ad35a15550
public abstract class EntityLiving extends Entity {
@@ -2847,7 +2846,7 @@ public abstract class EntityLiving extends Entity {
@@ -2853,7 +2852,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 fe0334b505de64ae1d96c4f0b6e66313d2b40010..b88bd19fc3ebaf3ae467b5ad35a15550
if (!list.isEmpty()) {
// Paper - move up
@@ -2985,9 +2984,16 @@ public abstract class EntityLiving extends Entity {
@@ -2991,9 +2990,16 @@ public abstract class EntityLiving extends Entity {
return !this.dead && this.collides; // CraftBukkit
}

2
work/Bukkit

@ -1 +1 @@
Subproject commit 8f495b8db1947dbd978ebbac81973e8793bf7967
Subproject commit 6f9fe1d936fa2183170de5ff95ee6832dac788c3

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 768d7fc2df23c3882bff4613b689bf5e9781e5ca
Subproject commit 878b43758db4dbe6e9cc0c07c3b52d8c96344d5d