mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-15 07:01:36 +08:00
[Auto] Updated Upstream (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
CraftBukkit Changes:
79ada744 SPIGOT-4382: Fix damage_absorbed statistic
This commit is contained in:
Aikar
parent
e1056b7187
commit
32c9917149
@ -1,4 +1,4 @@
|
||||
From db96209eeb825730f55d161a488b58dd2cbd8c3f Mon Sep 17 00:00:00 2001
|
||||
From 5cee08790d9d3bd321e9b29d41e454da135016c3 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..a6292f1d74
|
||||
index 000000000..a6292f1d7
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
|
||||
@@ -0,0 +1,132 @@
|
||||
@ -144,7 +144,7 @@ index 0000000000..a6292f1d74
|
||||
+}
|
||||
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 d2efcca80a..4812da0dac 100644
|
||||
index d2efcca80..4812da0da 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 d2efcca80a..4812da0dac 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
|
||||
index 8811dbc9b3..7818a3b6a7 100644
|
||||
index 8811dbc9b..7818a3b6a 100644
|
||||
--- a/src/main/java/net/minecraft/server/Block.java
|
||||
+++ b/src/main/java/net/minecraft/server/Block.java
|
||||
@@ -23,6 +23,15 @@ public class Block implements IMaterial {
|
||||
@ -317,7 +317,7 @@ index 8811dbc9b3..7818a3b6a7 100644
|
||||
private final float frictionFactor;
|
||||
protected final BlockStateList<Block, IBlockData> blockStateList;
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
|
||||
index e3d1761b49..fbebd4591c 100644
|
||||
index e3d1761b4..fbebd4591 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> {
|
||||
@ -348,7 +348,7 @@ index e3d1761b49..fbebd4591c 100644
|
||||
// CraftBukkit end
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
index 3045d6d063..68212aa26e 100644
|
||||
index 3045d6d06..68212aa26 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
|
||||
@@ -90,7 +90,7 @@ public class ChunkProviderServer implements IChunkProvider {
|
||||
@ -389,7 +389,7 @@ index 3045d6d063..68212aa26e 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 df07b2b889..f969c036f3 100644
|
||||
index df07b2b88..f969c036f 100644
|
||||
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -436,7 +436,7 @@ index df07b2b889..f969c036f3 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
|
||||
index b7cdc495a3..8b9b076ded 100644
|
||||
index b7cdc495a..8b9b076de 100644
|
||||
--- a/src/main/java/net/minecraft/server/CustomFunction.java
|
||||
+++ b/src/main/java/net/minecraft/server/CustomFunction.java
|
||||
@@ -13,12 +13,22 @@ public class CustomFunction {
|
||||
@ -463,7 +463,7 @@ index b7cdc495a3..8b9b076ded 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 4d7e151793..40ff72f725 100644
|
||||
index 4d7e15179..40ff72f72 100644
|
||||
--- a/src/main/java/net/minecraft/server/CustomFunctionData.java
|
||||
+++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
|
||||
@@ -109,7 +109,7 @@ public class CustomFunctionData implements ITickable, IResourcePackListener {
|
||||
@ -476,7 +476,7 @@ index 4d7e151793..40ff72f725 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 efa738d4ec..dabad6b055 100644
|
||||
index efa738d4e..dabad6b05 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;
|
||||
@ -529,7 +529,7 @@ index efa738d4ec..dabad6b055 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 5914439b1c..f1cf6cf1cd 100644
|
||||
index 5914439b1..f1cf6cf1c 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
|
||||
@ -568,7 +568,7 @@ index 5914439b1c..f1cf6cf1cd 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 8d33c16580..603208caf8 100644
|
||||
index 76cc9085b..ce79887cf 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;
|
||||
@ -580,7 +580,7 @@ index 8d33c16580..603208caf8 100644
|
||||
|
||||
public abstract class EntityLiving extends Entity {
|
||||
|
||||
@@ -2020,7 +2020,6 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2023,7 +2023,6 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
|
||||
public void tick() {
|
||||
@ -588,7 +588,7 @@ index 8d33c16580..603208caf8 100644
|
||||
super.tick();
|
||||
this.cV();
|
||||
this.o();
|
||||
@@ -2094,9 +2093,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2097,9 +2096,7 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
}
|
||||
|
||||
@ -598,7 +598,7 @@ index 8d33c16580..603208caf8 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 {
|
||||
@@ -2175,8 +2172,6 @@ public abstract class EntityLiving extends Entity {
|
||||
} else {
|
||||
this.bv = 0;
|
||||
}
|
||||
@ -607,7 +607,7 @@ index 8d33c16580..603208caf8 100644
|
||||
}
|
||||
|
||||
protected float e(float f, float f1) {
|
||||
@@ -2243,7 +2238,6 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2246,7 +2241,6 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
|
||||
this.world.methodProfiler.a("ai");
|
||||
@ -615,7 +615,7 @@ index 8d33c16580..603208caf8 100644
|
||||
if (this.isFrozen()) {
|
||||
this.bg = false;
|
||||
this.bh = 0.0F;
|
||||
@@ -2254,7 +2248,6 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2257,7 +2251,6 @@ public abstract class EntityLiving extends Entity {
|
||||
this.doTick();
|
||||
this.world.methodProfiler.e();
|
||||
}
|
||||
@ -623,7 +623,7 @@ index 8d33c16580..603208caf8 100644
|
||||
|
||||
this.world.methodProfiler.e();
|
||||
this.world.methodProfiler.a("jump");
|
||||
@@ -2279,9 +2272,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2282,9 +2275,7 @@ public abstract class EntityLiving extends Entity {
|
||||
this.n();
|
||||
AxisAlignedBB axisalignedbb = this.getBoundingBox();
|
||||
|
||||
@ -633,7 +633,7 @@ index 8d33c16580..603208caf8 100644
|
||||
this.world.methodProfiler.e();
|
||||
this.world.methodProfiler.a("push");
|
||||
if (this.bw > 0) {
|
||||
@@ -2289,9 +2280,7 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2292,9 +2283,7 @@ public abstract class EntityLiving extends Entity {
|
||||
this.a(axisalignedbb, this.getBoundingBox());
|
||||
}
|
||||
|
||||
@ -644,7 +644,7 @@ index 8d33c16580..603208caf8 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
|
||||
index ae31935c48..70c9b1f50c 100644
|
||||
index ae31935c4..70c9b1f50 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 {
|
||||
@ -675,7 +675,7 @@ index ae31935c48..70c9b1f50c 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index ac534ea3ee..bb4d2cabfe 100644
|
||||
index ac534ea3e..bb4d2cabf 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -828,7 +828,7 @@ index ac534ea3ee..bb4d2cabfe 100644
|
||||
this.methodProfiler.e();
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
index ac6d8cc6e6..d975c2ccf1 100644
|
||||
index ac6d8cc6e..d975c2ccf 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -922,7 +922,7 @@ index ac6d8cc6e6..d975c2ccf1 100644
|
||||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
index cbc86feb74..30f909a1d3 100644
|
||||
index cbc86feb7..30f909a1d 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
||||
@@ -59,6 +59,7 @@ import org.bukkit.inventory.CraftingInventory;
|
||||
@ -961,7 +961,7 @@ index cbc86feb74..30f909a1d3 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 616797dc6e..3a5daf6705 100644
|
||||
index 616797dc6..3a5daf670 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
|
||||
@@ -1,10 +1,16 @@
|
||||
@ -982,7 +982,7 @@ index 616797dc6e..3a5daf6705 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 ead9697e65..26df2ff32f 100644
|
||||
index ead9697e6..26df2ff32 100644
|
||||
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
||||
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1006,7 +1006,7 @@ index ead9697e65..26df2ff32f 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 a07895935e..ee5c2421bb 100644
|
||||
index a07895935..ee5c2421b 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> {
|
||||
@ -1060,7 +1060,7 @@ index a07895935e..ee5c2421bb 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;
|
||||
@ -1080,7 +1080,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 b5b0cbf647..53e35634a8 100644
|
||||
index f381e23be..a934a4b30 100644
|
||||
--- a/src/main/java/net/minecraft/server/World.java
|
||||
+++ b/src/main/java/net/minecraft/server/World.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1195,7 +1195,7 @@ index b5b0cbf647..53e35634a8 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 4be2d8d3c4..e4d03b6779 100644
|
||||
index 4be2d8d3c..e4d03b677 100644
|
||||
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
||||
@@ -1,5 +1,6 @@
|
||||
@ -1302,7 +1302,7 @@ index 4be2d8d3c4..e4d03b6779 100644
|
||||
|
||||
// CraftBukkit start
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 540126c31f..53033f0df1 100644
|
||||
index 540126c31..53033f0df 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1869,12 +1869,31 @@ public final class CraftServer implements Server {
|
||||
@ -1339,7 +1339,7 @@ index 540126c31f..53033f0df1 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 4c8ab2bc97..0000000000
|
||||
index 4c8ab2bc9..000000000
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
|
||||
+++ /dev/null
|
||||
@@ -1,174 +0,0 @@
|
||||
@ -1518,7 +1518,7 @@ index 4c8ab2bc97..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 @@
|
||||
@ -1554,7 +1554,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 9f78f2c4ae..b8bdcb6b74 100644
|
||||
index 9f78f2c4a..b8bdcb6b7 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1715,6 +1715,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@ -1571,7 +1571,7 @@ index 9f78f2c4ae..b8bdcb6b74 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 f11bd7545f..93b9134d6e 100644
|
||||
index f11bd7545..93b9134d6 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
|
||||
@@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
@ -1647,7 +1647,7 @@ index f11bd7545f..93b9134d6e 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 7e7ce9a81b..46029ce246 100644
|
||||
index 7e7ce9a81..46029ce24 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
|
||||
@@ -1,8 +1,8 @@
|
||||
@ -1729,7 +1729,7 @@ index 7e7ce9a81b..46029ce246 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;
|
||||
@ -1741,7 +1741,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 e60fe5a920..f68e42c4d4 100644
|
||||
index e60fe5a92..f68e42c4d 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;
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
From 74df9791b9e08039c1dd88ae4f8557114b1de854 Mon Sep 17 00:00:00 2001
|
||||
From 4182ffd42847bd0fdcfdedbdee5371e3b9a0b919 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 ed6f5e70f3..442981f938 100644
|
||||
index 91baaa506..c3936c4e3 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 {
|
||||
@@ -2602,12 +2602,13 @@ public abstract class EntityLiving extends Entity {
|
||||
|
||||
protected void q() {
|
||||
if (!this.activeItem.isEmpty() && this.isHandRaised()) {
|
||||
@ -23,7 +23,7 @@ index ed6f5e70f3..442981f938 100644
|
||||
world.getServer().getPluginManager().callEvent(event);
|
||||
|
||||
if (event.isCancelled()) {
|
||||
@@ -2619,9 +2620,20 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2622,9 +2623,20 @@ public abstract class EntityLiving extends Entity {
|
||||
itemstack = this.activeItem.a(this.world, this);
|
||||
}
|
||||
|
||||
@ -45,5 +45,5 @@ index ed6f5e70f3..442981f938 100644
|
||||
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.19.0
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
From f328c4bf3c1f82b1e19a8f20201e5b938efb04c3 Mon Sep 17 00:00:00 2001
|
||||
From ea2c2b6a9ec6632dc008eb223f2d825e77205144 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 e4b64b2d26..f482011175 100644
|
||||
index c3936c4e3..d41a7fb08 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 e4b64b2d26..f482011175 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 {
|
||||
@@ -2467,7 +2477,7 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
|
||||
public void setAbsorptionHearts(float f) {
|
||||
@ -44,7 +44,7 @@ index e4b64b2d26..f482011175 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
index cd32239132..fed28ecd91 100644
|
||||
index cd3223913..fed28ecd9 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
||||
@@ -1563,6 +1563,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||
@ -56,5 +56,5 @@ index cd32239132..fed28ecd91 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.18.0
|
||||
2.19.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c30c57ac7ae9a69386053140d86c0d03d78059e7 Mon Sep 17 00:00:00 2001
|
||||
From 86e687c7ca2075a8210a77b978808f3e69ad5577 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
|
||||
@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
|
||||
You can set this to 0 to disable collisions.
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 391cdd2fa5..8923454524 100644
|
||||
index 391cdd2fa..892345452 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -347,4 +347,10 @@ public class PaperWorldConfig {
|
||||
@ -27,7 +27,7 @@ index 391cdd2fa5..8923454524 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||||
index a16fbd4579..cad4894000 100644
|
||||
index f3422a097..11dd946b4 100644
|
||||
--- a/src/main/java/net/minecraft/server/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||||
@@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
||||
@ -39,10 +39,10 @@ index a16fbd4579..cad4894000 100644
|
||||
// Spigot end
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 1b8763f618..8c56eeb11c 100644
|
||||
index 398ad151a..d926cbb24 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 {
|
||||
@@ -2357,8 +2357,11 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
}
|
||||
|
||||
@ -56,5 +56,5 @@ index 1b8763f618..8c56eeb11c 100644
|
||||
this.C(entity);
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.19.0
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
From ba92e8671f51c00dca93612905edd40b342da041 Mon Sep 17 00:00:00 2001
|
||||
From 9961d657e4eccc5d31266d52f8a8d3813ba45a19 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 72a2164fdf..61af2621c5 100644
|
||||
index b9227f7a7..f5770884b 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 72a2164fdf..61af2621c5 100644
|
||||
import com.google.common.base.Objects;
|
||||
import com.google.common.collect.Maps;
|
||||
import java.util.Collection;
|
||||
@@ -2083,6 +2084,13 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2086,6 +2087,13 @@ public abstract class EntityLiving extends Entity {
|
||||
ItemStack itemstack1 = this.getEquipment(enumitemslot);
|
||||
|
||||
if (!ItemStack.matches(itemstack1, itemstack)) {
|
||||
@ -30,7 +30,7 @@ index 72a2164fdf..61af2621c5 100644
|
||||
if (!itemstack.isEmpty()) {
|
||||
this.getAttributeMap().a(itemstack.a(enumitemslot));
|
||||
diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
|
||||
index a90ac68c30..49592e5572 100644
|
||||
index a90ac68c3..49592e557 100644
|
||||
--- a/src/main/java/net/minecraft/server/EnumItemSlot.java
|
||||
+++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
|
||||
@@ -20,6 +20,7 @@ public enum EnumItemSlot {
|
||||
@ -42,5 +42,5 @@ index a90ac68c30..49592e5572 100644
|
||||
return this.g;
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.19.0
|
||||
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
From f12aed9eac0dc15fb9da809485a598f7d50c4083 Mon Sep 17 00:00:00 2001
|
||||
From c546b639b151d6b6137f0a838ee210b339fdd0de 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
|
||||
|
||||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
index 16e601f7e9..2e3e48637a 100644
|
||||
index 16e601f7e..2e3e48637 100644
|
||||
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||||
@@ -412,4 +412,9 @@ public class PaperWorldConfig {
|
||||
@ -19,10 +19,10 @@ index 16e601f7e9..2e3e48637a 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index e2ceb7ae4b..ef1a1e5790 100644
|
||||
index f5770884b..566f6e3a6 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 {
|
||||
@@ -2703,7 +2703,7 @@ public abstract class EntityLiving extends Entity {
|
||||
if (this.isHandRaised() && !this.activeItem.isEmpty()) {
|
||||
Item item = this.activeItem.getItem();
|
||||
|
||||
@ -31,7 +31,7 @@ index e2ceb7ae4b..ef1a1e5790 100644
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
@@ -2788,4 +2788,16 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2791,4 +2791,16 @@ public abstract class EntityLiving extends Entity {
|
||||
public boolean df() {
|
||||
return true;
|
||||
}
|
||||
@ -49,7 +49,7 @@ index e2ceb7ae4b..ef1a1e5790 100644
|
||||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
index 9acafadbbf..a09cd02403 100644
|
||||
index 9acafadbb..a09cd0240 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
@@ -533,5 +533,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||
@ -69,5 +69,5 @@ index 9acafadbbf..a09cd02403 100644
|
||||
// Paper end
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.19.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1050d9af422c12ea913fe0312ed122fc0aafb85d Mon Sep 17 00:00:00 2001
|
||||
From d0f62979bd534c691c6c0f9f7f29763881499a01 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 9f0bc5a8e2..dd14f99dee 100644
|
||||
index a8f58a13f..c051200da 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 9f0bc5a8e2..dd14f99dee 100644
|
||||
protected int bu;
|
||||
protected int bv;
|
||||
private BlockPosition bL;
|
||||
@@ -2689,10 +2689,12 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2692,10 +2692,12 @@ public abstract class EntityLiving extends Entity {
|
||||
return this.activeItem;
|
||||
}
|
||||
|
||||
@ -32,7 +32,7 @@ index 9f0bc5a8e2..dd14f99dee 100644
|
||||
return this.isHandRaised() ? this.activeItem.k() - this.cX() : 0;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
index a09cd02403..0860f2334d 100644
|
||||
index a09cd0240..0860f2334 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
|
||||
@@ -543,5 +543,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
|
||||
@ -62,5 +62,5 @@ index a09cd02403..0860f2334d 100644
|
||||
// Paper end
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.19.0
|
||||
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
From 53c450f0d30d97e0ddee7a1dfd43912b7a310a72 Mon Sep 17 00:00:00 2001
|
||||
From cc884144a0d80b771854d1e74c12eb9e26c9e251 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 904b67c26..890a3a02b 100644
|
||||
index c051200da..1328f8889 100644
|
||||
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
@@ -2810,6 +2810,22 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -2813,6 +2813,22 @@ public abstract class EntityLiving extends Entity {
|
||||
}
|
||||
|
||||
// Paper start
|
||||
@ -72,5 +72,5 @@ index 0860f2334..028495700 100644
|
||||
return getLineOfSight(transparent, maxDistance, 2);
|
||||
}
|
||||
--
|
||||
2.18.0
|
||||
2.19.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 399e9456e54ee49d7bccb7ef65aa3dc3172237ae Mon Sep 17 00:00:00 2001
|
||||
From ce2c789269e4675bf3af76a5ec7933563eb0c4b3 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
|
||||
@ -69,7 +69,7 @@ index 35afffede..e8e741374 100644
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
||||
index 890a3a02b..4aea8e4c7 100644
|
||||
index 1328f8889..13dd55549 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 {
|
||||
@ -193,7 +193,7 @@ index 890a3a02b..4aea8e4c7 100644
|
||||
@Nullable
|
||||
protected SoundEffect cs() {
|
||||
return SoundEffects.ENTITY_GENERIC_DEATH;
|
||||
@@ -1706,10 +1734,12 @@ public abstract class EntityLiving extends Entity {
|
||||
@@ -1709,10 +1737,12 @@ public abstract class EntityLiving extends Entity {
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 94b8708aca2424734417b82a4e872c85740bde16
|
||||
Subproject commit 79ada744cba8ddec39bd65adc12adefa9c8a45d3
|
||||
Loading…
Reference in New Issue
Block a user