OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 06:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

[Auto] Updated Upstream (CraftBukkit)

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

CraftBukkit Changes:
acbba8ba SPIGOT-4635: Restore shield damage sound
This commit is contained in:
Aikar 2019-02-25 02:56:39 -05:00
parent 73b65f4f8b
commit e6fc2d18c3
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
13 changed files with 96 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
Spigot-Server-Patches/0009-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 57d99a2cfab3d3e23bea53c80ba7bf1535cdf999 Mon Sep 17 00:00:00 2001
From 16adea3781a6e944aed12e5110fcc19c2900a401 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
new file mode 100644
index 0000000000..66d02e048b
index 000000000..66d02e048
--- /dev/null
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
@@ -0,0 +1,132 @@
@ -144,7 +144,7 @@ index 0000000000..66d02e048b
+}
diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
new file mode 100644
index 0000000000..145cb274b0
index 000000000..145cb274b
--- /dev/null
+++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
@@ -0,0 +1,104 @@
@ -253,7 +253,7 @@ index 0000000000..145cb274b0
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index c4c1877d59..1256a0d589 100644
index c4c1877d5..1256a0d58 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@ -297,7 +297,7 @@ index c4c1877d59..1256a0d589 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
index c09961be9b..dbf1089bac 100644
index c09961be9..dbf1089ba 100644
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
@@ -22,6 +22,15 @@ public class Block implements IMaterial {
@ -317,7 +317,7 @@ index c09961be9b..dbf1089bac 100644
private final float frictionFactor;
protected final BlockStateList<Block, IBlockData> blockStateList;
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 23dee9b563..eca1284cc3 100644
index 23dee9b56..eca1284cc 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -854,6 +854,7 @@ public class Chunk implements IChunkAccess {
@ -337,7 +337,7 @@ index 23dee9b563..eca1284cc3 100644
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
index df2711a5f8..732c8793e5 100644
index df2711a5f..732c8793e 100644
--- a/src/main/java/net/minecraft/server/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/ChunkMap.java
@@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@ -357,7 +357,7 @@ index df2711a5f8..732c8793e5 100644
return chunk1;
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index a8cdcb7da8..eb83e20d50 100644
index a8cdcb7da..eb83e20d5 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -88,7 +88,7 @@ public class ChunkProviderServer implements IChunkProvider {
@ -398,7 +398,7 @@ index a8cdcb7da8..eb83e20d50 100644
this.chunkLoader.saveChunk(this.world, ichunkaccess, unloaded); // Spigot
} catch (IOException ioexception) {
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 8e5ce6c181..35976a26f3 100644
index 8e5ce6c18..35976a26f 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -1,5 +1,6 @@
@ -445,7 +445,7 @@ index 8e5ce6c181..35976a26f3 100644
}
diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
index 65574eb2e5..bc87cfc4b6 100644
index 65574eb2e..bc87cfc4b 100644
--- a/src/main/java/net/minecraft/server/CustomFunction.java
+++ b/src/main/java/net/minecraft/server/CustomFunction.java
@@ -12,12 +12,22 @@ public class CustomFunction {
@ -472,7 +472,7 @@ index 65574eb2e5..bc87cfc4b6 100644
return this.b;
}
diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
index f28f4f3cd3..6b417be1dd 100644
index f28f4f3cd..6b417be1d 100644
--- a/src/main/java/net/minecraft/server/CustomFunctionData.java
+++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
@@ -100,7 +100,7 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
@ -485,7 +485,7 @@ index f28f4f3cd3..6b417be1dd 100644
int j = 0;
CustomFunction.c[] acustomfunction_c = customfunction.b();
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index ad9c00bc80..4e9ef43b45 100644
index ad9c00bc8..4e9ef43b4 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -29,7 +29,7 @@ import org.apache.logging.log4j.Level;
@ -538,7 +538,7 @@ index ad9c00bc80..4e9ef43b45 100644
return waitable.get();
} catch (java.util.concurrent.ExecutionException e) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index faf4d0c0db..e329c2f48a 100644
index faf4d0c0d..e329c2f48 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -27,7 +27,8 @@ import org.bukkit.command.CommandSender;
@ -577,7 +577,7 @@ index faf4d0c0db..e329c2f48a 100644
protected float ab() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ed859ccf95..31bbbbd969 100644
index 745b652a5..ccacc6e4f 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@ -589,7 +589,7 @@ index ed859ccf95..31bbbbd969 100644
public abstract class EntityLiving extends Entity {
@@ -2023,7 +2023,6 @@ public abstract class EntityLiving extends Entity {
@@ -2024,7 +2024,6 @@ public abstract class EntityLiving extends Entity {
}
public void tick() {
@ -597,7 +597,7 @@ index ed859ccf95..31bbbbd969 100644
super.tick();
this.cV();
this.o();
@@ -2094,9 +2093,7 @@ public abstract class EntityLiving extends Entity {
@@ -2095,9 +2094,7 @@ public abstract class EntityLiving extends Entity {
}
}
@ -607,7 +607,7 @@ index ed859ccf95..31bbbbd969 100644
double d0 = this.locX - this.lastX;
double d1 = this.locZ - this.lastZ;
float f = (float) (d0 * d0 + d1 * d1);
@@ -2172,8 +2169,6 @@ public abstract class EntityLiving extends Entity {
@@ -2173,8 +2170,6 @@ public abstract class EntityLiving extends Entity {
} else {
this.bv = 0;
}
@ -616,7 +616,7 @@ index ed859ccf95..31bbbbd969 100644
}
protected float e(float f, float f1) {
@@ -2243,7 +2238,6 @@ public abstract class EntityLiving extends Entity {
@@ -2244,7 +2239,6 @@ public abstract class EntityLiving extends Entity {
}
this.world.methodProfiler.enter("ai");
@ -624,7 +624,7 @@ index ed859ccf95..31bbbbd969 100644
if (this.isFrozen()) {
this.bg = false;
this.bh = 0.0F;
@@ -2254,7 +2248,6 @@ public abstract class EntityLiving extends Entity {
@@ -2255,7 +2249,6 @@ public abstract class EntityLiving extends Entity {
this.doTick();
this.world.methodProfiler.exit();
}
@ -632,7 +632,7 @@ index ed859ccf95..31bbbbd969 100644
this.world.methodProfiler.exit();
this.world.methodProfiler.enter("jump");
@@ -2279,9 +2272,7 @@ public abstract class EntityLiving extends Entity {
@@ -2280,9 +2273,7 @@ public abstract class EntityLiving extends Entity {
this.n();
AxisAlignedBB axisalignedbb = this.getBoundingBox();
@ -642,7 +642,7 @@ index ed859ccf95..31bbbbd969 100644
this.world.methodProfiler.exit();
this.world.methodProfiler.enter("push");
if (this.bw > 0) {
@@ -2289,9 +2280,7 @@ public abstract class EntityLiving extends Entity {
@@ -2290,9 +2281,7 @@ public abstract class EntityLiving extends Entity {
this.a(axisalignedbb, this.getBoundingBox());
}
@ -653,7 +653,7 @@ index ed859ccf95..31bbbbd969 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index cd462f7dfc..45ab33d1ae 100644
index cd462f7df..45ab33d1a 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -168,7 +168,7 @@ public class EntityTracker {
@ -684,7 +684,7 @@ index cd462f7dfc..45ab33d1ae 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 72de40434f..7e89d7158b 100644
index 72de40434..7e89d7158 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1,5 +1,6 @@
@ -837,7 +837,7 @@ index 72de40434f..7e89d7158b 100644
this.methodProfiler.exit();
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index c24f4a8fea..e01222ad2b 100644
index c24f4a8fe..e01222ad2 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -1,5 +1,6 @@
@ -929,7 +929,7 @@ index c24f4a8fea..e01222ad2b 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index a2ec56bc90..da0d0cc10f 100644
index a2ec56bc9..da0d0cc10 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@ -984,7 +984,7 @@ index a2ec56bc90..da0d0cc10f 100644
// this.minecraftServer.getCommandDispatcher().a(this.player.getCommandListener(), s);
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
index a73947d261..596aa27feb 100644
index a73947d26..596aa27fe 100644
--- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
+++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
@@ -1,12 +1,19 @@
@ -1008,7 +1008,7 @@ index a73947d261..596aa27feb 100644
throw CancelledPacketHandleException.INSTANCE;
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 54e44cba35..3a83819d56 100644
index 54e44cba3..3a83819d5 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1,5 +1,6 @@
@ -1032,7 +1032,7 @@ index 54e44cba35..3a83819d56 100644
public WhiteList getWhitelist() {
diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
index 0da57948a3..6571fc5952 100644
index 0da57948a..6571fc595 100644
--- a/src/main/java/net/minecraft/server/TickListServer.java
+++ b/src/main/java/net/minecraft/server/TickListServer.java
@@ -24,13 +24,19 @@ public class TickListServer<T> implements TickList<T> {
@ -1086,7 +1086,7 @@ index 0da57948a3..6571fc5952 100644
}
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index c69209497b..68ac014aab 100644
index c69209497..68ac014aa 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@ -1106,7 +1106,7 @@ index c69209497b..68ac014aab 100644
private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
protected World world;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9865f7f7aa..a1c5375a57 100644
index 9865f7f7a..a1c5375a5 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,6 @@
@ -1214,7 +1214,7 @@ index 9865f7f7aa..a1c5375a57 100644
public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index a7ae16681d..5a7087c758 100644
index a7ae16681..5a7087c75 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1,5 +1,6 @@
@ -1316,7 +1316,7 @@ index a7ae16681d..5a7087c758 100644
// CraftBukkit start
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 2bf30cd6b4..eb4d3fe069 100644
index 2bf30cd6b..eb4d3fe06 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1985,12 +1985,31 @@ public final class CraftServer implements Server {
@ -1353,7 +1353,7 @@ index 2bf30cd6b4..eb4d3fe069 100644
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
deleted file mode 100644
index 2ab4b11a8d..0000000000
index 2ab4b11a8..000000000
--- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
+++ /dev/null
@@ -1,173 +0,0 @@
@ -1531,7 +1531,7 @@ index 2ab4b11a8d..0000000000
- }
-}
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
index 413dd35f06..52a8c48fa4 100644
index 413dd35f0..52a8c48fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
@@ -1,6 +1,8 @@
@ -1567,7 +1567,7 @@ index 413dd35f06..52a8c48fa4 100644
public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 753704c87d..ca3393ef8f 100644
index 753704c87..ca3393ef8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1695,6 +1695,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -1586,7 +1586,7 @@ index 753704c87d..ca3393ef8f 100644
public Player.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
index 646128f16d..d75cc42e11 100644
index 646128f16..d75cc42e1 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -16,6 +16,7 @@ import java.util.concurrent.atomic.AtomicReference;
@ -1653,7 +1653,7 @@ index 646128f16d..d75cc42e11 100644
private boolean isReady(final int currentTick) {
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
index 3f55381c15..f32e660107 100644
index 3f55381c1..f32e66010 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -2,8 +2,8 @@ package org.bukkit.craftbukkit.scheduler;
@ -1735,7 +1735,7 @@ index 3f55381c15..f32e660107 100644
- // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
index e52ef47b78..3d90b34268 100644
index e52ef47b7..3d90b3426 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
@@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@ -1747,7 +1747,7 @@ index e52ef47b78..3d90b34268 100644
this.value = value;
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index c1071c92ee..a99c0cea0f 100644
index c1071c92e..a99c0cea0 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -30,7 +30,7 @@ import net.minecraft.server.EntityWither;

10
Spigot-Server-Patches/0072-Custom-replacement-for-eaten-items.patch
View file

@ -1,14 +1,14 @@
From 10577886e694d4d691bcbaa626e0cac3dbeababa Mon Sep 17 00:00:00 2001
From 6e920c1db82cb6d65b371a79e058ce677075873f Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 21 Jun 2015 15:07:20 -0400
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 00b16251f..6d05cc244 100644
index f94badc76..2357cfbd6 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2599,12 +2599,13 @@ public abstract class EntityLiving extends Entity {
@@ -2600,12 +2600,13 @@ public abstract class EntityLiving extends Entity {
protected void q() {
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
@ -23,7 +23,7 @@ index 00b16251f..6d05cc244 100644
world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -2619,9 +2620,20 @@ public abstract class EntityLiving extends Entity {
@@ -2620,9 +2621,20 @@ public abstract class EntityLiving extends Entity {
itemstack = this.activeItem.a(this.world, this);
}
@ -45,5 +45,5 @@ index 00b16251f..6d05cc244 100644
}
--
2.19.2
2.20.1

8
Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch
View file

@ -1,11 +1,11 @@
From e57ce470c534ef83164235eeefc0d6544195a018 Mon Sep 17 00:00:00 2001
From 0a43ff4f2dc9135098b7e6eb36effc893f1f4546 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400
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 6598612230..bc3a69c513 100644
index 2357cfbd6..69961bbfb 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -499,7 +499,13 @@ public abstract class EntityLiving extends Entity {
@ -34,7 +34,7 @@ index 6598612230..bc3a69c513 100644
// CraftBukkit start - Handle scaled health
if (this instanceof EntityPlayer) {
org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
@@ -2464,7 +2474,7 @@ public abstract class EntityLiving extends Entity {
@@ -2465,7 +2475,7 @@ public abstract class EntityLiving extends Entity {
}
public void setAbsorptionHearts(float f) {
@ -44,7 +44,7 @@ index 6598612230..bc3a69c513 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 43824f9633..1bc8db5e00 100644
index f10174524..1e2ea437c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1532,6 +1532,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

8
Spigot-Server-Patches/0169-Cap-Entity-Collisions.patch
View file

@ -1,4 +1,4 @@
From fa363af6a7a85bf4630df7d709e16e0d5c757ee5 Mon Sep 17 00:00:00 2001
From 7eba79d80f71e892b6910c910812675add63ede1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 22 Jan 2017 18:07:56 -0500
Subject: [PATCH] Cap Entity Collisions
@ -27,7 +27,7 @@ index 5c50c62e5..e49eb0caf 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e1944774c..b613d3d15 100644
index f9973a363..4be9226c8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -39,10 +39,10 @@ index e1944774c..b613d3d15 100644
// Spigot end
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index f2e38b9f3..b7923a1a5 100644
index eb7ed070b..4efd62f0b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2354,8 +2354,11 @@ public abstract class EntityLiving extends Entity {
@@ -2355,8 +2355,11 @@ public abstract class EntityLiving extends Entity {
}
}

6
Spigot-Server-Patches/0213-Add-PlayerArmorChangeEvent.patch
View file

@ -1,11 +1,11 @@
From 3d2a61c0fcd768b1206f3ac3b45b092a47c2a109 Mon Sep 17 00:00:00 2001
From 1350655d71b5c9ecdabe801c33678c48838a4535 Mon Sep 17 00:00:00 2001
From: pkt77 <parkerkt77@gmail.com>
Date: Fri, 10 Nov 2017 23:46:34 -0500
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 6e96cea08..ffff7390e 100644
index 46a09faf9..49e55ebdb 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 6e96cea08..ffff7390e 100644
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
import java.util.Collection;
@@ -2084,6 +2085,13 @@ public abstract class EntityLiving extends Entity {
@@ -2085,6 +2086,13 @@ public abstract class EntityLiving extends Entity {
ItemStack itemstack1 = this.getEquipment(enumitemslot);
if (!ItemStack.matches(itemstack1, itemstack)) {

10
Spigot-Server-Patches/0269-Make-shield-blocking-delay-configurable.patch
View file

@ -1,4 +1,4 @@
From 0741f31ada8315f118a38e97acfcfa5133d30ec7 Mon Sep 17 00:00:00 2001
From 1156ee87e9e5e134ce99184906330ab7d395fb0f Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 16 Jun 2018 01:18:16 -0500
Subject: [PATCH] Make shield blocking delay configurable
@ -19,10 +19,10 @@ index 2033ace4f..875650b8d 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index fadf1df28..67ed48652 100644
index 49e55ebdb..866fd90ce 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2700,7 +2700,7 @@ public abstract class EntityLiving extends Entity {
@@ -2701,7 +2701,7 @@ public abstract class EntityLiving extends Entity {
if (this.isHandRaised() && !this.activeItem.isEmpty()) {
Item item = this.activeItem.getItem();
@ -31,7 +31,7 @@ index fadf1df28..67ed48652 100644
} else {
return false;
}
@@ -2788,4 +2788,16 @@ public abstract class EntityLiving extends Entity {
@@ -2789,4 +2789,16 @@ public abstract class EntityLiving extends Entity {
public boolean df() {
return true;
}
@ -69,5 +69,5 @@ index 2f96842bb..8e65bfc78 100644
// Paper end
}
--
2.20.0
2.20.1

8
Spigot-Server-Patches/0276-LivingEntity-Hand-Raised-Item-Use-API.patch
View file

@ -1,4 +1,4 @@
From c8a0f617763aabdf82bf3856b5ca3b375deab1a5 Mon Sep 17 00:00:00 2001
From 2d800eaf6113cd7a62575bfd80b4dd77a85e01bf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 29 Jun 2018 00:21:28 -0400
Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@ -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 8aef335a1..3e9af4481 100644
index 8687c0a86..fa4c593de 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -106,7 +106,7 @@ public abstract class EntityLiving extends Entity {
@ -18,7 +18,7 @@ index 8aef335a1..3e9af4481 100644
protected int bu;
protected int bv;
private BlockPosition bL;
@@ -2689,10 +2689,12 @@ public abstract class EntityLiving extends Entity {
@@ -2690,10 +2690,12 @@ public abstract class EntityLiving extends Entity {
return this.activeItem;
}
@ -62,5 +62,5 @@ index 8e65bfc78..52834b6da 100644
// Paper end
}
--
2.20.0
2.20.1

8
Spigot-Server-Patches/0328-Allow-disabling-armour-stand-ticking.patch
View file

@ -1,4 +1,4 @@
From 91071de56fbc02911603727c8b850aa6c2bc2fd8 Mon Sep 17 00:00:00 2001
From a4b32478b53f263fe1a08efe28c5ac09d5e85cef Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 15 Aug 2018 01:26:09 -0700
Subject: [PATCH] Allow disabling armour stand ticking
@ -141,10 +141,10 @@ index c604182dd..2c54e3e34 100644
public Vector3f r() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 87715c302..8f5ff37c2 100644
index fa4c593de..d94f5e609 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2082,52 +2082,7 @@ public abstract class EntityLiving extends Entity {
@@ -2083,52 +2083,7 @@ public abstract class EntityLiving extends Entity {
}
}
@ -198,7 +198,7 @@ index 87715c302..8f5ff37c2 100644
if (this.ticksLived % 20 == 0) {
this.getCombatTracker().g();
@@ -2220,6 +2175,57 @@ public abstract class EntityLiving extends Entity {
@@ -2221,6 +2176,57 @@ public abstract class EntityLiving extends Entity {
}
}

8
Spigot-Server-Patches/0347-Add-ray-tracing-methods-to-LivingEntity.patch
View file

@ -1,14 +1,14 @@
From f7376054077e494e444604793b6a528f8dec967b Mon Sep 17 00:00:00 2001
From 4b16cca18f6fdcd76917dc5e8c58e2d419ec9db2 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Mon, 3 Sep 2018 18:20:03 -0500
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 8f5ff37c2c..b4dcdda0cc 100644
index d94f5e609..381f19144 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2816,6 +2816,22 @@ public abstract class EntityLiving extends Entity {
@@ -2817,6 +2817,22 @@ public abstract class EntityLiving extends Entity {
}
// Paper start
@ -32,7 +32,7 @@ index 8f5ff37c2c..b4dcdda0cc 100644
public int getShieldBlockingDelay() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 52834b6da3..eeab59379a 100644
index 52834b6da..eeab59379 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -171,6 +171,23 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

20
Spigot-Server-Patches/0350-Improve-death-events.patch
View file

@ -1,4 +1,4 @@
From e6029510bcd0fbcc270a9c694c71894a6bfaaaa0 Mon Sep 17 00:00:00 2001
From a5da0803b43dbfff4d4b6ad181b5f8bc9273a84e Mon Sep 17 00:00:00 2001
From: Phoenix616 <mail@moep.tv>
Date: Tue, 21 Aug 2018 01:39:35 +0100
Subject: [PATCH] Improve death events
@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
internal code.
diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
index bbd5e2b2a8..19750ceed1 100644
index bbd5e2b2a..19750ceed 100644
--- a/src/main/java/net/minecraft/server/CombatTracker.java
+++ b/src/main/java/net/minecraft/server/CombatTracker.java
@@ -175,6 +175,7 @@ public class CombatTracker {
@ -27,7 +27,7 @@ index bbd5e2b2a8..19750ceed1 100644
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 6b65c69423..9eb280adc5 100644
index 6b65c6942..9eb280adc 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1553,6 +1553,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -55,7 +55,7 @@ index 6b65c69423..9eb280adc5 100644
return SoundCategory.NEUTRAL;
}
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 2c54e3e34a..a5cc5e2842 100644
index 2c54e3e34..a5cc5e284 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -659,7 +659,8 @@ public class EntityArmorStand extends EntityLiving {
@ -69,7 +69,7 @@ index 2c54e3e34a..a5cc5e2842 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index b4dcdda0cc..60aaf05475 100644
index 381f19144..56191d1f2 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -76,14 +76,14 @@ public abstract class EntityLiving extends Entity {
@ -192,7 +192,7 @@ index b4dcdda0cc..60aaf05475 100644
@Nullable
protected SoundEffect cs() {
return SoundEffects.ENTITY_GENERIC_DEATH;
@@ -1709,10 +1737,12 @@ public abstract class EntityLiving extends Entity {
@@ -1710,10 +1738,12 @@ public abstract class EntityLiving extends Entity {
}
@ -206,7 +206,7 @@ index b4dcdda0cc..60aaf05475 100644
return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 1054367d0e..00c2072d70 100644
index 13409c041..b01fffbd6 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -72,6 +72,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -257,7 +257,7 @@ index 1054367d0e..00c2072d70 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
index 17fab031b4..ee8219e3ba 100644
index 17fab031b..ee8219e3b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
@@ -674,6 +674,22 @@ public enum CraftSound {
@ -284,7 +284,7 @@ index 17fab031b4..ee8219e3ba 100644
this.minecraftKey = minecraftKey;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 07b9545e76..a2eae5d10c 100644
index 07b9545e7..a2eae5d10 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1686,7 +1686,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -305,7 +305,7 @@ index 07b9545e76..a2eae5d10c 100644
public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 93da4c7267..054ebc82bd 100644
index 93da4c726..054ebc82b 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -600,9 +600,16 @@ public class CraftEventFactory {

14
Spigot-Server-Patches/0377-Add-LivingEntity-getTargetEntity.patch
View file

@ -1,11 +1,11 @@
From a4d33b7947cfca78f42e45ea096adcf82b4c4e23 Mon Sep 17 00:00:00 2001
From 41243acd91e5d2308878b9edf74b0b81d4808035 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sat, 22 Sep 2018 00:33:08 -0500
Subject: [PATCH] Add LivingEntity#getTargetEntity
diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
index c5e541985f..d6a5c74079 100644
index c5e541985..d6a5c7407 100644
--- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
+++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
@@ -95,6 +95,7 @@ public class AxisAlignedBB {
@ -46,7 +46,7 @@ index c5e541985f..d6a5c74079 100644
public MovingObjectPosition b(Vec3D vec3d, Vec3D vec3d1) {
return this.a(vec3d, vec3d1, (BlockPosition) null);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 66947e3071..2f27af7f6e 100644
index 66947e307..2f27af7f6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1533,6 +1533,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -71,7 +71,7 @@ index 66947e3071..2f27af7f6e 100644
return this.d(this.pitch, this.yaw);
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 60aaf05475..710ad8b176 100644
index 56191d1f2..9815509c4 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -3,6 +3,8 @@ package net.minecraft.server;
@ -92,7 +92,7 @@ index 60aaf05475..710ad8b176 100644
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import org.bukkit.Location;
@@ -2862,6 +2866,36 @@ public abstract class EntityLiving extends Entity {
@@ -2863,6 +2867,36 @@ public abstract class EntityLiving extends Entity {
return world.rayTrace(start, end, fluidCollisionOption);
}
@ -130,7 +130,7 @@ index 60aaf05475..710ad8b176 100644
public int getShieldBlockingDelay() {
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index f6916fd455..71f08d53c7 100644
index f6916fd45..71f08d53c 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -19,6 +19,7 @@ public final class IEntitySelector {
@ -142,7 +142,7 @@ index f6916fd455..71f08d53c7 100644
return !(entity instanceof EntityHuman) || !((EntityHuman) entity).isSpectator();
};
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index eeab59379a..d6a4bc64ae 100644
index eeab59379..d6a4bc64a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -186,6 +186,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

12
Spigot-Server-Patches/0402-force-entity-dismount-during-teleportation.patch
View file

@ -1,4 +1,4 @@
From 7634b4bcd399116e5fad8e042d210b54b0084ed3 Mon Sep 17 00:00:00 2001
From b3f1693c2f1fb4764ed75a1c33f9dbe1f8e980d2 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 15 Nov 2018 13:38:37 +0000
Subject: [PATCH] force entity dismount during teleportation
@ -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 e448f08930..88298680fb 100644
index e448f0893..88298680f 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2110,12 +2110,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -72,7 +72,7 @@ index e448f08930..88298680fb 100644
if (event.isCancelled()) {
return false;
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 82684dd688..dab958a042 100644
index 82684dd68..dab958a04 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -991,8 +991,11 @@ public abstract class EntityHuman extends EntityLiving {
@ -90,10 +90,10 @@ index 82684dd688..dab958a042 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 710ad8b176..4acbc17aed 100644
index 9815509c4..b1d86c8e9 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2478,10 +2478,13 @@ public abstract class EntityLiving extends Entity {
@@ -2479,10 +2479,13 @@ public abstract class EntityLiving extends Entity {
return ((Byte) this.datawatcher.get(EntityLiving.aw) & 4) != 0;
}
@ -110,7 +110,7 @@ index 710ad8b176..4acbc17aed 100644
this.A(entity);
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 71c4ed8fa6..1c90f2f85a 100644
index 005bcaac1..0ea31156b 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -778,10 +778,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 4e4cde4816dbc6484533b68085aa608b0ed610b6
Subproject commit acbba8badd83c5a66f60f5a608b052a89287425e