Skip to content

Commit ce2eae5

Browse files
aikaraikar
committed
[Auto] Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: b56e816 PaperMC#519: Add ArrowBodyCountChangeEvent CraftBukkit Changes: 3980640 PaperMC#697: Add ArrowBodyCountChangeEvent
1 parent 563f77a commit ce2eae5

50 files changed

Lines changed: 158 additions & 158 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add methods for working with arrows stuck in living entities
55

66

77
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
8-
index dd6eff5cc56b6276fa897f0f892259c6804c3b05..ec585c7499eb88d10436ef1d461bace0c54a6f07 100644
8+
index 468a5e13fa789a116daae49b6ab304e5dfa6ee85..3154b1cb18b1cf97705ccd2e52bd87bd6cf5d8cf 100644
99
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
1010
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
11-
@@ -563,4 +563,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
11+
@@ -591,4 +591,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
1212
*/
1313
@NotNull
1414
public EntityCategory getCategory();

‎Spigot-API-Patches/0064-LivingEntity-setKiller.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#setKiller
55

66

77
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
8-
index 5b0c95ab7372c7accd190b9052b587637106c4af..f0018823e17fab49e0167ece1c8c9eda2d562b87 100644
8+
index 3154b1cb18b1cf97705ccd2e52bd87bd6cf5d8cf..a2bdecc8b27652460064126f8e5bb8d038f5d11a 100644
99
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
1010
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
11-
@@ -251,6 +251,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
11+
@@ -279,6 +279,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
1212
@Nullable
1313
public Player getKiller();
1414

‎Spigot-API-Patches/0106-Make-shield-blocking-delay-configurable.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Make shield blocking delay configurable
55

66

77
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
8-
index 30604ea038021032745ec586cee57c0089ad2d4b..022a6ef9158db937291051d6c4dfbc27f747bc3d 100644
8+
index a2bdecc8b27652460064126f8e5bb8d038f5d11a..1d4ddb01c3d8d4619276c6b8ebb2c7f290df7d8b 100644
99
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
1010
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
11-
@@ -586,5 +586,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
11+
@@ -614,5 +614,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
1212
* @param arrows Number of arrows to stick in this entity
1313
*/
1414
void setArrowsStuck(int arrows);

‎Spigot-API-Patches/0113-LivingEntity-Hand-Raised-Item-Use-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
66
How long an entity has raised hands to charge an attack or use an item
77

88
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
9-
index 022a6ef9158db937291051d6c4dfbc27f747bc3d..069d9131406d7e29db56f51940a0809a0dd9e703 100644
9+
index 1d4ddb01c3d8d4619276c6b8ebb2c7f290df7d8b..e0f77cf3a3aa8a741f0ee5c077ff56e80605be76 100644
1010
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
1111
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
1212
@@ -12,6 +12,7 @@ import org.bukkit.attribute.Attributable;
@@ -17,7 +17,7 @@ index 022a6ef9158db937291051d6c4dfbc27f747bc3d..069d9131406d7e29db56f51940a0809a
1717
import org.bukkit.potion.PotionEffect;
1818
import org.bukkit.potion.PotionEffectType;
1919
import org.bukkit.projectiles.ProjectileSource;
20-
@@ -600,5 +601,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
20+
@@ -628,5 +629,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
2121
* @param delay Delay in ticks
2222
*/
2323
void setShieldBlockingDelay(int delay);

‎Spigot-API-Patches/0189-Entity-Jump-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..f0067c2e953d18e1a33536980071ba3f
5757
+ }
5858
+}
5959
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
60-
index d470f0364e8be5398f1dad864389f7ac3df586ff..ff02b79dcac07b86a1cc8fd360965b39ee595eb9 100644
60+
index 0624099fcd28c7f108131cb0f58d323818379838..d225a59f149cdc770ee3243f9604291c28f5a2ed 100644
6161
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
6262
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
63-
@@ -743,5 +743,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
63+
@@ -771,5 +771,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
6464
* @return Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
6565
*/
6666
boolean isHandRaised();

‎Spigot-API-Patches/0220-Add-playPickupItemAnimation-to-LivingEntity.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity
55

66

77
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
8-
index ff02b79dcac07b86a1cc8fd360965b39ee595eb9..9099e762907d38900a42b75dff1b6831b50aecb9 100644
8+
index d225a59f149cdc770ee3243f9604291c28f5a2ed..f3813210e63d9859c0461833a502b43361a2e134 100644
99
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
1010
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
11-
@@ -763,5 +763,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
11+
@@ -791,5 +791,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
1212
* @param jumping entity jump state
1313
*/
1414
void setJumping(boolean jumping);

‎Spigot-Server-Patches/0004-MC-Utils.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3109,10 +3109,10 @@ index 05b1aa66d1dc7bad96236c0cf2c85ddf209a5422..5da6528672d0f14766ca99ce5d2cc40b
31093109
// CraftBukkit start - fire event
31103110
setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true);
31113111
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
3112-
index e8f313e2b4ff4aa431243e8edb02c100390efc24..78b027465ab727b7706590d00a46e75184606432 100644
3112+
index 58bfdb34a31a3150954f57dde9c83e91c89ee3c1..3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4 100644
31133113
--- a/src/main/java/net/minecraft/server/EntityLiving.java
31143114
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
3115-
@@ -137,6 +137,7 @@ public abstract class EntityLiving extends Entity {
3115+
@@ -138,6 +138,7 @@ public abstract class EntityLiving extends Entity {
31163116
public boolean collides = true;
31173117
public Set<UUID> collidableExemptions = new HashSet<>();
31183118
public boolean canPickUpLoot;
@@ -3133,7 +3133,7 @@ index 07c48d777a71a979fb1f0063eef2e613e448d2eb..8a5d6869c269369d45cfe4e61853c442
31333133
super(entitytypes, world);
31343134
this.f = 5;
31353135
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
3136-
index 0e23f117432680346a31b4b43b29ba6981a5c30a..5a06220f876c868ac2ddb4aeaad9f91f0804f2a5 100644
3136+
index 6dab17d6bcf15a362ce35e744f425dff603dac32..9b46c931edfc3a821c6c0125f8258b6b550d7342 100644
31373137
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
31383138
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
31393139
@@ -93,6 +93,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -4190,7 +4190,7 @@ index 43168f3836eb8823f3b2046882664ba45f1be678..127c03c321e1414e0d174c8d81a7851c
41904190

41914191
@Override
41924192
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
4193-
index 4791b59fc2740bdc81b62748d3edbf2b2a83e043..c7a7e2cf54b4ca7fd65fca63c0f102f479a0f3e5 100644
4193+
index e00c3d6ea480c28e6f8ef6d4c36c13fc08035908..81a99c156c7f626964c3e93491d8bd1d6647e960 100644
41944194
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
41954195
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
41964196
@@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn {

‎Spigot-Server-Patches/0009-Timings-v2.patch‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,10 +1042,10 @@ index fc6930327625bf951bb0ba21df5eb1a559a2b295..afaf32db9c53d164f13f5afcd4202b40
10421042

10431043
protected BlockPosition ao() {
10441044
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
1045-
index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc039a7ac51 100644
1045+
index 3ee9be26bbfbf1fa2c4133da3e95c8ac3f533fa4..6f9fe8959e7ca47effead4ab2a59c75d4781eb00 100644
10461046
--- a/src/main/java/net/minecraft/server/EntityLiving.java
10471047
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
1048-
@@ -41,7 +41,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
1048+
@@ -42,7 +42,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
10491049
import org.bukkit.event.player.PlayerItemConsumeEvent;
10501050
// CraftBukkit end
10511051

@@ -1054,15 +1054,15 @@ index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc0
10541054

10551055
public abstract class EntityLiving extends Entity {
10561056

1057-
@@ -2334,7 +2334,6 @@ public abstract class EntityLiving extends Entity {
1057+
@@ -2345,7 +2345,6 @@ public abstract class EntityLiving extends Entity {
10581058

10591059
@Override
10601060
public void tick() {
10611061
- SpigotTimings.timerEntityBaseTick.startTiming(); // Spigot
10621062
super.tick();
10631063
this.t();
10641064
this.v();
1065-
@@ -2383,9 +2382,7 @@ public abstract class EntityLiving extends Entity {
1065+
@@ -2394,9 +2393,7 @@ public abstract class EntityLiving extends Entity {
10661066
}
10671067
}
10681068

@@ -1072,7 +1072,7 @@ index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc0
10721072
double d0 = this.locX() - this.lastX;
10731073
double d1 = this.locZ() - this.lastZ;
10741074
float f = (float) (d0 * d0 + d1 * d1);
1075-
@@ -2465,8 +2462,6 @@ public abstract class EntityLiving extends Entity {
1075+
@@ -2476,8 +2473,6 @@ public abstract class EntityLiving extends Entity {
10761076
if (this.isSleeping()) {
10771077
this.pitch = 0.0F;
10781078
}
@@ -1081,23 +1081,23 @@ index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc0
10811081
}
10821082

10831083
private void p() {
1084-
@@ -2648,7 +2643,6 @@ public abstract class EntityLiving extends Entity {
1084+
@@ -2659,7 +2654,6 @@ public abstract class EntityLiving extends Entity {
10851085

10861086
this.setMot(d4, d5, d6);
10871087
this.world.getMethodProfiler().enter("ai");
10881088
- SpigotTimings.timerEntityAI.startTiming(); // Spigot
10891089
if (this.isFrozen()) {
10901090
this.jumping = false;
10911091
this.aR = 0.0F;
1092-
@@ -2658,7 +2652,6 @@ public abstract class EntityLiving extends Entity {
1092+
@@ -2669,7 +2663,6 @@ public abstract class EntityLiving extends Entity {
10931093
this.doTick();
10941094
this.world.getMethodProfiler().exit();
10951095
}
10961096
- SpigotTimings.timerEntityAI.stopTiming(); // Spigot
10971097

10981098
this.world.getMethodProfiler().exit();
10991099
this.world.getMethodProfiler().enter("jump");
1100-
@@ -2693,9 +2686,9 @@ public abstract class EntityLiving extends Entity {
1100+
@@ -2704,9 +2697,9 @@ public abstract class EntityLiving extends Entity {
11011101
this.r();
11021102
AxisAlignedBB axisalignedbb = this.getBoundingBox();
11031103

@@ -1109,7 +1109,7 @@ index 78b027465ab727b7706590d00a46e75184606432..380165b54e118df19e6adefd35ad0bc0
11091109
this.world.getMethodProfiler().exit();
11101110
this.world.getMethodProfiler().enter("push");
11111111
if (this.bf > 0) {
1112-
@@ -2703,9 +2696,7 @@ public abstract class EntityLiving extends Entity {
1112+
@@ -2714,9 +2707,7 @@ public abstract class EntityLiving extends Entity {
11131113
this.a(axisalignedbb, this.getBoundingBox());
11141114
}
11151115

‎Spigot-Server-Patches/0033-Disable-explosion-knockback.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,26 @@ index f038d3f7dc7d1034a3ee9f2384a85642f224836e..25e0717186366af580e512eedfd403b8
1919
+ }
2020
}
2121
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
22-
index 380165b54e118df19e6adefd35ad0bc039a7ac51..df5984cf80da32e5997581171d0eb2bdbbf22244 100644
22+
index 6f9fe8959e7ca47effead4ab2a59c75d4781eb00..0b05cc912a70ed1aaa70e9a66d789e95c78c5fc1 100644
2323
--- a/src/main/java/net/minecraft/server/EntityLiving.java
2424
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
25-
@@ -1183,6 +1183,7 @@ public abstract class EntityLiving extends Entity {
25+
@@ -1184,6 +1184,7 @@ public abstract class EntityLiving extends Entity {
2626
}
2727
}
2828

2929
+ boolean knockbackCancelled = world.paperConfig.disableExplosionKnockback && damagesource.isExplosion() && this instanceof EntityHuman; // Paper - Disable explosion knockback
3030
if (flag1) {
3131
if (flag) {
3232
this.world.broadcastEntityEffect(this, (byte) 29);
33-
@@ -1201,6 +1202,7 @@ public abstract class EntityLiving extends Entity {
33+
@@ -1202,6 +1203,7 @@ public abstract class EntityLiving extends Entity {
3434
b0 = 2;
3535
}
3636

3737
+ if (!knockbackCancelled) // Paper - Disable explosion knockback
3838
this.world.broadcastEntityEffect(this, b0);
3939
}
4040

41-
@@ -1224,6 +1226,7 @@ public abstract class EntityLiving extends Entity {
41+
@@ -1225,6 +1227,7 @@ public abstract class EntityLiving extends Entity {
4242
}
4343
}
4444

@@ -47,7 +47,7 @@ index 380165b54e118df19e6adefd35ad0bc039a7ac51..df5984cf80da32e5997581171d0eb2bd
4747
if (!this.f(damagesource)) {
4848
SoundEffect soundeffect = this.getSoundDeath();
4949
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
50-
index 19f7312ee31baebbbccc3126b28418e7b817d247..7b6c3a667ea67b25f9f12d4049dfc51b1c9fb69d 100644
50+
index 88d2fa33e4c9f90f2aa80b3afbf28edbdbeb03db..b7d635ca2cbe9bf7e2e3a2ae5fa7a20f39dd913b 100644
5151
--- a/src/main/java/net/minecraft/server/Explosion.java
5252
+++ b/src/main/java/net/minecraft/server/Explosion.java
5353
@@ -189,14 +189,14 @@ public class Explosion {

‎Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ index c222539ac9f0a2b9f7e4a6ded873db4ca2b2e7b6..9295f5aa306d062bf95cd10e13796315
3737
}
3838

3939
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
40-
index df5984cf80da32e5997581171d0eb2bdbbf22244..ff47c899302c7cdedce2190d57745e265e1783d0 100644
40+
index 0b05cc912a70ed1aaa70e9a66d789e95c78c5fc1..60ffbec4bb28f8e0661183f6e21d547878774387 100644
4141
--- a/src/main/java/net/minecraft/server/EntityLiving.java
4242
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
43-
@@ -641,6 +641,7 @@ public abstract class EntityLiving extends Entity {
43+
@@ -642,6 +642,7 @@ public abstract class EntityLiving extends Entity {
4444
if (nbttagcompound.hasKeyOfType("Team", 8)) {
4545
String s = nbttagcompound.getString("Team");
4646
ScoreboardTeam scoreboardteam = this.world.getScoreboard().getTeam(s);

0 commit comments

Comments
 (0)