forked from PaperMC/Paper
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
9b98a25
commit 1387cff
Showing
113 changed files
with
671 additions
and
1,179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
From 98238d93b1456c8bb79e0d6bb95f5773761dd861 Mon Sep 17 00:00:00 2001 | ||
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 | ||
From: Zach Brown <[email protected]> | ||
Date: Tue, 1 Mar 2016 00:16:08 +0100 | ||
Subject: [PATCH] POM changes | ||
|
||
|
||
diff --git a/pom.xml b/pom.xml | ||
index 117a7f8c..2a5846a1 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -3,37 +3,36 @@ | ||
|
@@ -21,7 +21,7 @@ index 117a7f8c..2a5846a1 100644 | |
+ </parent> | ||
+ | ||
+ <artifactId>paper-api</artifactId> | ||
<version>1.13.1-R0.1-SNAPSHOT</version> | ||
<version>1.13.2-R0.1-SNAPSHOT</version> | ||
<packaging>jar</packaging> | ||
|
||
- <name>Spigot-API</name> | ||
|
@@ -136,5 +136,5 @@ index 117a7f8c..2a5846a1 100644 | |
- </profiles> | ||
</project> | ||
-- | ||
2.19.0 | ||
2.19.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
From b66f17991abf9f3df03862b742227841741b1d22 Mon Sep 17 00:00:00 2001 | ||
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 | ||
From: Zach Brown <[email protected]> | ||
Date: Mon, 29 Feb 2016 20:40:33 -0600 | ||
Subject: [PATCH] POM Changes | ||
|
||
|
||
diff --git a/pom.xml b/pom.xml | ||
index f1f0c20a52..17c3baaec9 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/pom.xml | ||
+++ b/pom.xml | ||
@@ -1,12 +1,11 @@ | ||
|
@@ -16,7 +16,7 @@ index f1f0c20a52..17c3baaec9 100644 | |
- <artifactId>spigot</artifactId> | ||
+ <artifactId>paper</artifactId> | ||
<packaging>jar</packaging> | ||
<version>1.13.1-R0.1-SNAPSHOT</version> | ||
<version>1.13.2-R0.1-SNAPSHOT</version> | ||
- <name>Spigot</name> | ||
- <url>http://www.spigotmc.org</url> | ||
+ <name>Paper</name> | ||
|
@@ -169,7 +169,7 @@ index f1f0c20a52..17c3baaec9 100644 | |
<plugins> | ||
<plugin> | ||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java | ||
index 93046379d0..674096cab1 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java | ||
+++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java | ||
@@ -11,7 +11,7 @@ public final class Versioning { | ||
|
@@ -182,5 +182,5 @@ index 93046379d0..674096cab1 100644 | |
|
||
if (stream != null) { | ||
-- | ||
2.18.0 | ||
2.19.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
From 9d3389fb2535b20a63c20203e34b59b5a83817e9 Mon Sep 17 00:00:00 2001 | ||
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 | ||
From: Aikar <[email protected]> | ||
Date: Mon, 28 Mar 2016 20:55:47 -0400 | ||
Subject: [PATCH] MC Utils | ||
|
||
|
||
diff --git a/src/main/java/net/minecraft/server/AttributeInstance.java b/src/main/java/net/minecraft/server/AttributeInstance.java | ||
index 1c1a6a37a..0929e0189 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/AttributeInstance.java | ||
+++ b/src/main/java/net/minecraft/server/AttributeInstance.java | ||
@@ -20,8 +20,10 @@ public interface AttributeInstance { | ||
|
@@ -20,7 +20,7 @@ index 1c1a6a37a..0929e0189 100644 | |
|
||
void b(UUID var1); | ||
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java | ||
index 6ffc53514..5c5f19b4b 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/BlockPosition.java | ||
+++ b/src/main/java/net/minecraft/server/BlockPosition.java | ||
@@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger; | ||
|
@@ -65,10 +65,10 @@ index 6ffc53514..5c5f19b4b 100644 | |
return this.c(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2)); | ||
} | ||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java | ||
index bc5e4a654..d3eac35e4 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/Chunk.java | ||
+++ b/src/main/java/net/minecraft/server/Chunk.java | ||
@@ -28,7 +28,7 @@ import com.google.common.collect.Lists; // CraftBukkit | ||
@@ -27,7 +27,7 @@ import com.google.common.collect.Lists; // CraftBukkit | ||
public class Chunk implements IChunkAccess { | ||
|
||
private static final Logger d = LogManager.getLogger(); | ||
|
@@ -77,7 +77,7 @@ index bc5e4a654..d3eac35e4 100644 | |
private final ChunkSection[] sections; | ||
private final BiomeBase[] f; | ||
private final boolean[] g; | ||
@@ -699,6 +699,7 @@ public class Chunk implements IChunkAccess { | ||
@@ -700,6 +700,7 @@ public class Chunk implements IChunkAccess { | ||
return this.a(blockposition, Chunk.EnumTileEntityState.CHECK); | ||
} | ||
|
||
|
@@ -86,7 +86,7 @@ index bc5e4a654..d3eac35e4 100644 | |
public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) { | ||
// CraftBukkit start | ||
diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java | ||
index 744762b8b..d9608121b 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java | ||
+++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java | ||
@@ -23,6 +23,8 @@ public class ChunkCoordIntPair { | ||
|
@@ -99,7 +99,7 @@ index 744762b8b..d9608121b 100644 | |
return (long)i & 4294967295L | ((long)j & 4294967295L) << 32; | ||
} | ||
diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java | ||
index 3b6b3b9a9..22af9c188 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java | ||
+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java | ||
@@ -16,7 +16,7 @@ import org.apache.logging.log4j.Logger; | ||
|
@@ -112,7 +112,7 @@ index 3b6b3b9a9..22af9c188 100644 | |
private final IChunkLoader e; | ||
private final IAsyncTaskHandler f; | ||
diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java | ||
index 95ca5f6d8..0dc948a37 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/DataBits.java | ||
+++ b/src/main/java/net/minecraft/server/DataBits.java | ||
@@ -54,6 +54,7 @@ public class DataBits { | ||
|
@@ -124,7 +124,7 @@ index 95ca5f6d8..0dc948a37 100644 | |
return this.a; | ||
} | ||
diff --git a/src/main/java/net/minecraft/server/DataPalette.java b/src/main/java/net/minecraft/server/DataPalette.java | ||
index 7f905b1e0..fa5b9262b 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/DataPalette.java | ||
+++ b/src/main/java/net/minecraft/server/DataPalette.java | ||
@@ -3,10 +3,11 @@ package net.minecraft.server; | ||
|
@@ -142,7 +142,7 @@ index 7f905b1e0..fa5b9262b 100644 | |
void b(PacketDataSerializer var1); | ||
|
||
diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java | ||
index 304e47bf2..6e7454b13 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/DataPaletteBlock.java | ||
+++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java | ||
@@ -7,7 +7,7 @@ import java.util.function.Function; | ||
|
@@ -184,7 +184,7 @@ index 304e47bf2..6e7454b13 100644 | |
this.b(); | ||
packetdataserializer.writeByte(this.i); | ||
diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java | ||
index 2c6fbd1d6..a5c147b98 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/EntityCreature.java | ||
+++ b/src/main/java/net/minecraft/server/EntityCreature.java | ||
@@ -6,6 +6,7 @@ import org.bukkit.event.entity.EntityUnleashEvent; | ||
|
@@ -196,7 +196,7 @@ index 2c6fbd1d6..a5c147b98 100644 | |
private float b; | ||
|
||
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java | ||
index ebb177927..60b1dcd8e 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/EntityInsentient.java | ||
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java | ||
@@ -124,6 +124,7 @@ public abstract class EntityInsentient extends EntityLiving { | ||
|
@@ -208,7 +208,7 @@ index ebb177927..60b1dcd8e 100644 | |
// CraftBukkit start - fire event | ||
setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true); | ||
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java | ||
index 1aefd3763..76cc9085b 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/EntityLiving.java | ||
+++ b/src/main/java/net/minecraft/server/EntityLiving.java | ||
@@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity { | ||
|
@@ -220,7 +220,7 @@ index 1aefd3763..76cc9085b 100644 | |
@Override | ||
public float getBukkitYaw() { | ||
diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java | ||
index c0f48bbc2..a0e3b72c1 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/EntityMonster.java | ||
+++ b/src/main/java/net/minecraft/server/EntityMonster.java | ||
@@ -1,11 +1,14 @@ | ||
|
@@ -239,7 +239,7 @@ index c0f48bbc2..a0e3b72c1 100644 | |
return SoundCategory.HOSTILE; | ||
} | ||
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java | ||
index 17bfa356f..5c1ab6a0b 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/EntityTypes.java | ||
+++ b/src/main/java/net/minecraft/server/EntityTypes.java | ||
@@ -3,6 +3,7 @@ package net.minecraft.server; | ||
|
@@ -290,7 +290,7 @@ index 17bfa356f..5c1ab6a0b 100644 | |
// Paper end | ||
} | ||
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java | ||
index c54275bc2..318c4204d 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/ItemStack.java | ||
+++ b/src/main/java/net/minecraft/server/ItemStack.java | ||
@@ -26,6 +26,7 @@ import org.bukkit.TreeType; | ||
|
@@ -321,7 +321,7 @@ index c54275bc2..318c4204d 100644 | |
} | ||
diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java | ||
new file mode 100644 | ||
index 000000000..c97e116aa | ||
index 7ac07ac07ac0..7ac07ac07ac0 | ||
--- /dev/null | ||
+++ b/src/main/java/net/minecraft/server/MCUtil.java | ||
@@ -0,0 +1,316 @@ | ||
|
@@ -642,7 +642,7 @@ index 000000000..c97e116aa | |
+ } | ||
+} | ||
diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java | ||
index 41cd3ceab..2a66a3026 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/NBTTagCompound.java | ||
+++ b/src/main/java/net/minecraft/server/NBTTagCompound.java | ||
@@ -23,7 +23,7 @@ import org.apache.logging.log4j.Logger; | ||
|
@@ -687,7 +687,7 @@ index 41cd3ceab..2a66a3026 100644 | |
} | ||
} | ||
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java | ||
index 0afaea810..26da89724 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/NetworkManager.java | ||
+++ b/src/main/java/net/minecraft/server/NetworkManager.java | ||
@@ -44,7 +44,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> { | ||
|
@@ -728,7 +728,7 @@ index 0afaea810..26da89724 100644 | |
public QueuedPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) { | ||
this.a = packet; | ||
diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java | ||
index d04afceb7..a63a5811d 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/PacketDataSerializer.java | ||
+++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java | ||
@@ -33,6 +33,7 @@ public class PacketDataSerializer extends ByteBuf { | ||
|
@@ -740,7 +740,7 @@ index d04afceb7..a63a5811d 100644 | |
for (int j = 1; j < 5; ++j) { | ||
if ((i & -1 << j * 7) == 0) { | ||
diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java | ||
index 8e312c761..c20911c96 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/PacketEncoder.java | ||
+++ b/src/main/java/net/minecraft/server/PacketEncoder.java | ||
@@ -38,6 +38,7 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> { | ||
|
@@ -752,7 +752,7 @@ index 8e312c761..c20911c96 100644 | |
throw new SkipEncodeException(throwable); | ||
} else { | ||
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java | ||
index 12d6c99cf..af382815f 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java | ||
+++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java | ||
@@ -11,7 +11,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> { | ||
|
@@ -773,7 +773,7 @@ index 12d6c99cf..af382815f 100644 | |
int j = 0; | ||
ChunkSection[] achunksection = chunk.getSections(); | ||
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java | ||
index d455eadfc..8db0b6a6d 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/PlayerConnection.java | ||
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java | ||
@@ -68,9 +68,9 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { | ||
|
@@ -790,7 +790,7 @@ index d455eadfc..8db0b6a6d 100644 | |
private volatile int chatThrottle; | ||
private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle"); | ||
diff --git a/src/main/java/net/minecraft/server/PotionUtil.java b/src/main/java/net/minecraft/server/PotionUtil.java | ||
index 8fce3b022..58ac6eafc 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/PotionUtil.java | ||
+++ b/src/main/java/net/minecraft/server/PotionUtil.java | ||
@@ -103,6 +103,7 @@ public class PotionUtil { | ||
|
@@ -802,7 +802,7 @@ index 8fce3b022..58ac6eafc 100644 | |
MinecraftKey minecraftkey = IRegistry.POTION.getKey(potionregistry); | ||
if (potionregistry == Potions.EMPTY) { | ||
diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java | ||
index a21006290..6c6f006f3 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/RegistryBlockID.java | ||
+++ b/src/main/java/net/minecraft/server/RegistryBlockID.java | ||
@@ -54,6 +54,7 @@ public class RegistryBlockID<T> implements Registry<T> { | ||
|
@@ -814,7 +814,7 @@ index a21006290..6c6f006f3 100644 | |
return this.b.size(); | ||
} | ||
diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java | ||
index 1f1cb6a1b..ced573d7f 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/SystemUtils.java | ||
+++ b/src/main/java/net/minecraft/server/SystemUtils.java | ||
@@ -34,8 +34,8 @@ public class SystemUtils { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From 70f95e0e0ad11ed2007a83c24d855cbb800f764b Mon Sep 17 00:00:00 2001 | ||
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001 | ||
From: Aikar <[email protected]> | ||
Date: Wed, 4 Jul 2018 02:10:36 -0400 | ||
Subject: [PATCH] Store reference to current Chunk for Entity and Block | ||
|
@@ -8,10 +8,10 @@ This enables us a fast reference to the entities current chunk instead | |
of having to look it up by hashmap lookups. | ||
|
||
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java | ||
index bc43af7243..0a55ad6212 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/Chunk.java | ||
+++ b/src/main/java/net/minecraft/server/Chunk.java | ||
@@ -33,7 +33,7 @@ public class Chunk implements IChunkAccess { | ||
@@ -32,7 +32,7 @@ public class Chunk implements IChunkAccess { | ||
private final BiomeBase[] f; | ||
private final boolean[] g; | ||
private final Map<BlockPosition, NBTTagCompound> h; | ||
|
@@ -54,13 +54,13 @@ index bc43af7243..0a55ad6212 100644 | |
@@ -93,7 +116,7 @@ public class Chunk implements IChunkAccess { | ||
this.g = new boolean[256]; | ||
this.h = Maps.newHashMap(); | ||
this.heightMap = Maps.newHashMap(); | ||
this.heightMap = Maps.newEnumMap(HeightMap.Type.class); | ||
- this.tileEntities = Maps.newHashMap(); | ||
+ this.tileEntities = new TileEntityHashMap(); // Paper | ||
this.p = Maps.newHashMap(); | ||
this.q = Maps.newHashMap(); | ||
this.r = new ShortList[16]; | ||
@@ -652,6 +675,9 @@ public class Chunk implements IChunkAccess { | ||
@@ -653,6 +676,9 @@ public class Chunk implements IChunkAccess { | ||
entity.af = k; | ||
entity.ag = this.locZ; | ||
this.entitySlices[k].add(entity); | ||
|
@@ -70,7 +70,7 @@ index bc43af7243..0a55ad6212 100644 | |
} | ||
|
||
public void a(HeightMap.Type heightmap_type, long[] along) { | ||
@@ -670,8 +696,12 @@ public class Chunk implements IChunkAccess { | ||
@@ -671,8 +697,12 @@ public class Chunk implements IChunkAccess { | ||
if (i >= this.entitySlices.length) { | ||
i = this.entitySlices.length - 1; | ||
} | ||
|
@@ -85,7 +85,7 @@ index bc43af7243..0a55ad6212 100644 | |
} | ||
|
||
public boolean c(BlockPosition blockposition) { | ||
@@ -872,6 +902,7 @@ public class Chunk implements IChunkAccess { | ||
@@ -873,6 +903,7 @@ public class Chunk implements IChunkAccess { | ||
} | ||
} | ||
// Spigot End | ||
|
@@ -94,7 +94,7 @@ index bc43af7243..0a55ad6212 100644 | |
// Do not pass along players, as doing so can get them stuck outside of time. | ||
// (which for example disables inventory icon updates and prevents block breaking) | ||
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java | ||
index 19a3ba79f2..aa9e4ef5ee 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/Entity.java | ||
+++ b/src/main/java/net/minecraft/server/Entity.java | ||
@@ -134,7 +134,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke | ||
|
@@ -147,7 +147,7 @@ index 19a3ba79f2..aa9e4ef5ee 100644 | |
private String entityKeyString; | ||
|
||
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java | ||
index 7390061bf0..c69209497b 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/net/minecraft/server/TileEntity.java | ||
+++ b/src/main/java/net/minecraft/server/TileEntity.java | ||
@@ -41,6 +41,15 @@ public abstract class TileEntity implements KeyedObject { // Paper | ||
|
@@ -167,7 +167,7 @@ index 7390061bf0..c69209497b 100644 | |
|
||
@Nullable | ||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java | ||
index 5cce3644d0..7a204e8edf 100644 | ||
index 7ac07ac07ac0..7ac07ac07ac0 100644 | ||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java | ||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java | ||
@@ -9,6 +9,7 @@ import java.util.UUID; | ||
|
@@ -192,5 +192,5 @@ index 5cce3644d0..7a204e8edf 100644 | |
/** | ||
* Order is *EXTREMELY* important -- keep it right! =D | ||
-- | ||
2.19.0 | ||
2.19.1 | ||
|
Oops, something went wrong.