spigot-mirror/spigot
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/spigot.git synced 2025-09-18 21:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebuild patches

Browse source
This commit is contained in:
md_5 2023-11-19 19:06:46 +13:00
parent 7de1049b2a
commit b60a8662a0
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
24 changed files with 116 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Bukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 1029626ed6052d978d64c3f475fc7a44eb0e3369 Mon Sep 17 00:00:00 2001
From 5a0694a9d43b7c0bbfa5213b15e8bc67e702412d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 15 May 2017 15:16:15 +1000
Subject: [PATCH] Skeleton API Implementations
@ -37,10 +37,10 @@ index 130c169f..d00bdede 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 682854c0..46fda0b4 100644
index 16feb5ef..d89e047d 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2639,6 +2639,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2721,6 +2721,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
@ -75,13 +75,13 @@ index a7a2587b..4b6b9540 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 764c502c..ead9a9aa 100644
index dafb5d28..3b772500 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -714,4 +714,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@@ -756,4 +756,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@NotNull
SpawnCategory getSpawnCategory();
@ApiStatus.Experimental
Entity copy(@NotNull Location to);
+
+ // Spigot start
+ public class Spigot extends CommandSender.Spigot {
@ -120,10 +120,10 @@ index 158ac20f..d913298e 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index de462c23..76bf37b5 100644
index 3cf31b08..1c89efaf 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1921,4 +1921,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1982,4 +1982,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return whether the player allows server listings
*/
public boolean isAllowingServerListings();

6
Bukkit-Patches/0004-BungeeCord-Support.patch
View file

@ -1,14 +1,14 @@
From ec7713dcc90af97111fbf28336d1eda5b3123472 Mon Sep 17 00:00:00 2001
From ef6790904773753e6e127e7eb4dafd8352c56612 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:20:49 +1000
Subject: [PATCH] BungeeCord Support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 76bf37b5..190d7f7c 100644
index 1c89efaf..3dba9477 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1925,6 +1925,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1986,6 +1986,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Spigot start
public class Spigot extends Entity.Spigot {

6
Bukkit-Patches/0006-Add-respawn-API.patch
View file

@ -1,14 +1,14 @@
From 481c6823c6867060f0e9e427339085f79dab2513 Mon Sep 17 00:00:00 2001
From 88bc622a2de544e3bbc93e370be1102d75c9ab11 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:35:58 +0200
Subject: [PATCH] Add respawn API.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 190d7f7c..b5570545 100644
index 3dba9477..98ec15bd 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1935,6 +1935,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1996,6 +1996,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public InetSocketAddress getRawAddress() {
throw new UnsupportedOperationException("Not supported yet.");
}

6
Bukkit-Patches/0007-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From 1ef3382546c291e0dfc5f8f0967b2e796d092149 Mon Sep 17 00:00:00 2001
From 60b3c972c3a0fa2a642297fdee0a43e0c0c999ff Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:02:11 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b5570545..052f9e69 100644
index 98ec15bd..f9fd2b46 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1942,6 +1942,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2003,6 +2003,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void respawn() {
throw new UnsupportedOperationException("Not supported yet.");
}

8
Bukkit-Patches/0008-Silenceable-Lightning-API.patch
View file

@ -1,14 +1,14 @@
From 2511c534d3c8b88cbab1a476a927bc791a17059f Mon Sep 17 00:00:00 2001
From ce3dfa489c196642126f9e785ca7ad7b3c4f36ef Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:29 -0400
Subject: [PATCH] Silenceable Lightning API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index b9b32cb9f..dcd8feda6 100644
index d89e047d..85e2f6f2 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2642,6 +2642,29 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2724,6 +2724,29 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
// Spigot start
public class Spigot {
@ -39,7 +39,7 @@ index b9b32cb9f..dcd8feda6 100644
@NotNull
diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
index d913298ea..c49628f26 100644
index d913298e..c49628f2 100644
--- a/src/main/java/org/bukkit/entity/LightningStrike.java
+++ b/src/main/java/org/bukkit/entity/LightningStrike.java
@@ -86,6 +86,14 @@ public interface LightningStrike extends Entity {

6
Bukkit-Patches/0010-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From e1105c27ca4ca7279d6a316f311c0ef7fa749a1e Mon Sep 17 00:00:00 2001
From 09a3d8a438a1f490acf0142cd9833f500d189375 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 02:59:14 +0100
Subject: [PATCH] BungeeCord Chat API
@ -362,10 +362,10 @@ index 4b6b9540..284be63a 100644
@NotNull
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 052f9e69..3d84a75a 100644
index f9fd2b46..fc37e0c6 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1952,6 +1952,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2013,6 +2013,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public java.util.Set<Player> getHiddenPlayers() {
throw new UnsupportedOperationException("Not supported yet.");
}

6
Bukkit-Patches/0012-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 0c25806143c80239ecf6daac196fd444e806d531 Mon Sep 17 00:00:00 2001
From 68680a2c888472962bb2cb36d5134f816078c63f Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 30 Jul 2019 13:47:34 -0700
Subject: [PATCH] View Distance
@ -6,10 +6,10 @@ Subject: [PATCH] View Distance
This commit allows the retrieval of per world view distances.
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index dcd8feda6..5c9d74a5d 100644
index 85e2f6f2..cd000a06 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2639,6 +2639,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2721,6 +2721,22 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);

14
CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
View file

@ -1,4 +1,4 @@
From 99566e79af36b65b405a12a4f1b15e5555637f25 Mon Sep 17 00:00:00 2001
From bf1810546bece2e9f46352c4712f9d95dc50c151 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -27,10 +27,10 @@ index b1787a45f..6c1555761 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c71f276cc..c9002842f 100644
index 8d93355e3..dd9712a85 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1951,4 +1951,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1983,4 +1983,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
this.persistentDataContainer.putAll((NBTTagCompound) c);
}
}
@ -84,10 +84,10 @@ index 7fa2588b8..e0acbada8 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 4c6122822..380c76c43 100644
index c587411ac..348d1ad64 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1169,4 +1169,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1209,4 +1209,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
return perm;
}
@ -124,10 +124,10 @@ index 3a4fb14bf..3a68e1cf5 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index bece7b86b..843fd71a5 100644
index baf840c37..75baf53ba 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2155,4 +2155,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2157,4 +2157,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean isAllowingServerListings() {
return getHandle().allowsListing();
}

28
CraftBukkit-Patches/0006-Async-Operation-Catching.patch
View file

@ -1,4 +1,4 @@
From 01745be2ba8cd7ab5460f0da3916948046fbf9a9 Mon Sep 17 00:00:00 2001
From bc8eec7f49e913c3e394d5e5e189adb51f63e15a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 25 Mar 2014 16:10:01 +1100
Subject: [PATCH] Async Operation Catching
@ -42,7 +42,7 @@ index 72e1ebb2e..d2f717803 100644
Vec3D vec3d = entityplayer.position().subtract(this.entity.position());
int i = PlayerChunkMap.this.getPlayerViewDistance(entityplayer);
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 046e1483d..2437fc257 100644
index fbdca0d1a..cf587a21c 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -1050,6 +1050,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -61,7 +61,7 @@ index 046e1483d..2437fc257 100644
return this.entityManager.getEntityGetter();
}
@@ -1934,6 +1936,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1936,6 +1938,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
public void onTrackingStart(Entity entity) {
@ -69,7 +69,7 @@ index 046e1483d..2437fc257 100644
WorldServer.this.getChunkSource().addEntity(entity);
if (entity instanceof EntityPlayer) {
EntityPlayer entityplayer = (EntityPlayer) entity;
@@ -1971,6 +1974,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1973,6 +1976,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
public void onTrackingEnd(Entity entity) {
@ -134,10 +134,10 @@ index db28a1d1a..24d5cead3 100644
if (commandMap.dispatch(sender, commandLine)) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index c9002842f..648a24402 100644
index dd9712a85..7886cc85e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -273,6 +273,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -275,6 +275,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean unloadChunkRequest(int x, int z) {
@ -145,7 +145,7 @@ index c9002842f..648a24402 100644
if (isChunkLoaded(x, z)) {
world.getChunkSource().removeRegionTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 1, Unit.INSTANCE);
}
@@ -281,6 +282,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -283,6 +284,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
private boolean unloadChunk0(int x, int z, boolean save) {
@ -153,7 +153,7 @@ index c9002842f..648a24402 100644
if (!isChunkLoaded(x, z)) {
return true;
}
@@ -295,6 +297,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -297,6 +299,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean regenerateChunk(int x, int z) {
@ -161,7 +161,7 @@ index c9002842f..648a24402 100644
throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)");
/*
if (!unloadChunk0(x, z, false)) {
@@ -347,6 +350,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -349,6 +352,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
@ -169,7 +169,7 @@ index c9002842f..648a24402 100644
IChunkAccess chunk = world.getChunkSource().getChunk(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
// If generate = false, but the chunk already exists, we will get this back.
@@ -841,6 +845,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -848,6 +852,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<? super Entity> filter) {
@ -177,7 +177,7 @@ index c9002842f..648a24402 100644
Preconditions.checkArgument(boundingBox != null, "BoundingBox cannot be null");
AxisAlignedBB bb = new AxisAlignedBB(boundingBox.getMinX(), boundingBox.getMinY(), boundingBox.getMinZ(), boundingBox.getMaxX(), boundingBox.getMaxY(), boundingBox.getMaxZ());
@@ -995,6 +1000,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1002,6 +1007,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public void save() {
@ -186,10 +186,10 @@ index c9002842f..648a24402 100644
boolean oldSave = world.noSave;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 380c76c43..1e6b8dec5 100644
index 348d1ad64..f15922dbe 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -567,6 +567,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -571,6 +571,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@Override
public List<org.bukkit.entity.Entity> getNearbyEntities(double x, double y, double z) {
Preconditions.checkState(!entity.generation, "Cannot get nearby entities during world generation");
@ -198,7 +198,7 @@ index 380c76c43..1e6b8dec5 100644
List<Entity> notchEntityList = entity.level().getEntities(entity, entity.getBoundingBox().inflate(x, y, z), Predicates.alwaysTrue());
List<org.bukkit.entity.Entity> bukkitEntityList = new java.util.ArrayList<org.bukkit.entity.Entity>(notchEntityList.size());
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 843fd71a5..539ba62c5 100644
index 75baf53ba..53952c2f0 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -388,6 +388,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

8
CraftBukkit-Patches/0007-View-Distance.patch
View file

@ -1,4 +1,4 @@
From 3c14f625027c09a49b5c1577784964013fa76fef Mon Sep 17 00:00:00 2001
From 5497e02e5844709e4273ee7762f0a76d68b5da19 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:52:41 +1100
Subject: [PATCH] View Distance
@ -6,7 +6,7 @@ Subject: [PATCH] View Distance
This commit allows the user to select per world view distances.
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 2437fc257..bce7deb65 100644
index cf587a21c..76aa7eea4 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -279,8 +279,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -44,10 +44,10 @@ index f836b07ca..16dcde6b3 100644
entityplayer1.connection.send(new PacketPlayOutSpawnPosition(worldserver1.getSharedSpawnPos(), worldserver1.getSharedSpawnAngle()));
entityplayer1.connection.send(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 648a24402..bbce80b7b 100644
index 7886cc85e..7f646490c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1958,6 +1958,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1990,6 +1990,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
}

12
CraftBukkit-Patches/0008-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From b6951794efd66e76425131a9a3cf2756d475c4f4 Mon Sep 17 00:00:00 2001
From d0ae036351255965cd343362d45a377f3b2872ed Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 10 Jan 2013 00:18:11 -0500
Subject: [PATCH] Spigot Timings
@ -205,7 +205,7 @@ index caab95f0f..0e044ed95 100644
}
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index bce7deb65..74782ff5a 100644
index 76aa7eea4..e4cd5abe0 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -171,6 +171,7 @@ import net.minecraft.world.level.storage.WorldDataServer;
@ -327,7 +327,7 @@ index 52bbf842f..974e282cf 100644
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index fe029a4a0..d3ecf5ca7 100644
index 0c1855a25..b72b6fb35 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -136,6 +136,7 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@ -338,7 +338,7 @@ index fe029a4a0..d3ecf5ca7 100644
import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
@@ -308,6 +309,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -309,6 +310,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
public boolean lastDamageCancelled; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
public boolean persistentInvisibility = false;
public BlockPosition lastLavaContact;
@ -346,7 +346,7 @@ index fe029a4a0..d3ecf5ca7 100644
public float getBukkitYaw() {
return this.yRot;
@@ -785,6 +787,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -786,6 +788,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
public void move(EnumMoveType enummovetype, Vec3D vec3d) {
@ -354,7 +354,7 @@ index fe029a4a0..d3ecf5ca7 100644
if (this.noPhysics) {
this.setPos(this.getX() + vec3d.x, this.getY() + vec3d.y, this.getZ() + vec3d.z);
} else {
@@ -945,6 +948,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -946,6 +949,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
this.level().getProfiler().pop();
}
}

30
CraftBukkit-Patches/0012-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From 7f0c9aa5dbdf1b8ed270358c205933a48d2581e1 Mon Sep 17 00:00:00 2001
From 2bccad39a274d4e71de2c383e6479743356c66de Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 3 Feb 2013 05:10:21 -0500
Subject: [PATCH] Entity Activation Range
@ -9,7 +9,7 @@ This will drastically cut down on tick timings for entities that are not in rang
This change can have dramatic impact on gameplay if configured too low. Balance according to your servers desired gameplay.
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 74782ff5af..0d815a7b0c 100644
index e4cd5abe0..7cb48eb05 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -410,6 +410,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -35,10 +35,10 @@ index 74782ff5af..0d815a7b0c 100644
entity.setOldPosAndRot();
GameProfilerFiller gameprofilerfiller = this.getProfiler();
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index b7a91c91f8..c824c7cf58 100644
index b72b6fb35..afbc2b86e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -310,6 +310,12 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -311,6 +311,12 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
public boolean persistentInvisibility = false;
public BlockPosition lastLavaContact;
public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
@ -51,7 +51,7 @@ index b7a91c91f8..c824c7cf58 100644
public float getBukkitYaw() {
return this.yRot;
@@ -347,6 +353,13 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -348,6 +354,13 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
this.position = Vec3D.ZERO;
this.blockPosition = BlockPosition.ZERO;
this.chunkPosition = ChunkCoordIntPair.ZERO;
@ -66,7 +66,7 @@ index b7a91c91f8..c824c7cf58 100644
this.entityData.define(Entity.DATA_SHARED_FLAGS_ID, (byte) 0);
this.entityData.define(Entity.DATA_AIR_SUPPLY_ID, this.getMaxAirSupply());
diff --git a/src/main/java/net/minecraft/world/entity/EntityAgeable.java b/src/main/java/net/minecraft/world/entity/EntityAgeable.java
index bd2e7ba4eb..a64ea7677b 100644
index bd2e7ba4e..a64ea7677 100644
--- a/src/main/java/net/minecraft/world/entity/EntityAgeable.java
+++ b/src/main/java/net/minecraft/world/entity/EntityAgeable.java
@@ -26,6 +26,31 @@ public abstract class EntityAgeable extends EntityCreature {
@ -102,7 +102,7 @@ index bd2e7ba4eb..a64ea7677b 100644
public GroupDataEntity finalizeSpawn(WorldAccess worldaccess, DifficultyDamageScaler difficultydamagescaler, EnumMobSpawn enummobspawn, @Nullable GroupDataEntity groupdataentity, @Nullable NBTTagCompound nbttagcompound) {
if (groupdataentity == null) {
diff --git a/src/main/java/net/minecraft/world/entity/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/world/entity/EntityAreaEffectCloud.java
index 3d67ac66f6..c27be344f7 100644
index 3d67ac66f..c27be344f 100644
--- a/src/main/java/net/minecraft/world/entity/EntityAreaEffectCloud.java
+++ b/src/main/java/net/minecraft/world/entity/EntityAreaEffectCloud.java
@@ -169,6 +169,18 @@ public class EntityAreaEffectCloud extends Entity implements TraceableEntity {
@ -125,7 +125,7 @@ index 3d67ac66f6..c27be344f7 100644
public void tick() {
super.tick();
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 6242461565..b52ed2f18a 100644
index b8c112bcd..684f35e01 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -267,6 +267,13 @@ public abstract class EntityLiving extends Entity implements Attackable {
@ -143,7 +143,7 @@ index 6242461565..b52ed2f18a 100644
protected EntityLiving(EntityTypes<? extends EntityLiving> entitytypes, World world) {
super(entitytypes, world);
diff --git a/src/main/java/net/minecraft/world/entity/item/EntityItem.java b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
index 8e26d92c47..fa2c895d2a 100644
index 5ebfa14c1..7942e04d4 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
@@ -202,6 +202,28 @@ public class EntityItem extends Entity implements TraceableEntity {
@ -176,7 +176,7 @@ index 8e26d92c47..fa2c895d2a 100644
protected BlockPosition getBlockPosBelowThatAffectsMyMovement() {
return this.getOnPos(0.999999F);
diff --git a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
index ae62c50f1b..68cbd44270 100644
index ae62c50f1..68cbd4427 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -224,6 +224,17 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@ -198,7 +198,7 @@ index ae62c50f1b..68cbd44270 100644
protected void customServerAiStep() {
this.level().getProfiler().push("villagerBrain");
diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
index 8c8663c18e..fc775f5da6 100644
index 0da5895fe..a3047ef01 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
@@ -75,6 +75,18 @@ public abstract class EntityArrow extends IProjectile {
@ -221,7 +221,7 @@ index 8c8663c18e..fc775f5da6 100644
super(entitytypes, world);
this.pickup = EntityArrow.PickupStatus.DISALLOWED;
diff --git a/src/main/java/net/minecraft/world/entity/projectile/EntityFireworks.java b/src/main/java/net/minecraft/world/entity/projectile/EntityFireworks.java
index 543a3ff083..bed9e8f602 100644
index 543a3ff08..bed9e8f60 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/EntityFireworks.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/EntityFireworks.java
@@ -80,6 +80,22 @@ public class EntityFireworks extends IProjectile implements ItemSupplier {
@ -248,7 +248,7 @@ index 543a3ff083..bed9e8f602 100644
protected void defineSynchedData() {
this.entityData.define(EntityFireworks.DATA_ID_FIREWORKS_ITEM, ItemStack.EMPTY);
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
index aff7b6b438..d3328a695f 100644
index aff7b6b43..d3328a695 100644
--- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
+++ b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
@@ -39,6 +39,9 @@ public class SpigotTimings {
@ -263,7 +263,7 @@ index aff7b6b438..d3328a695f 100644
public static final HashMap<String, CustomTimingsHandler> pluginTaskTimingMap = new HashMap<String, CustomTimingsHandler>();
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
new file mode 100644
index 0000000000..c5688dd14f
index 000000000..c5688dd14
--- /dev/null
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -0,0 +1,262 @@
@ -530,7 +530,7 @@ index 0000000000..c5688dd14f
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index e3682d28ca..936279b5fb 100644
index e3682d28c..936279b5f 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -194,4 +194,21 @@ public class SpigotWorldConfig

6
CraftBukkit-Patches/0020-Properly-Close-Inventories.patch
View file

@ -1,4 +1,4 @@
From 8c17877198cd6fe005e4479e6eb2e8787295ecad Mon Sep 17 00:00:00 2001
From 3ac9bc2bcb1e2f03ea92b2a68824c24b03134382 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Thu, 27 Jun 2013 17:26:09 +1000
Subject: [PATCH] Properly Close Inventories
@ -6,7 +6,7 @@ Subject: [PATCH] Properly Close Inventories
Properly close inventories when unloading and switching worlds.
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 0d815a7b0c..b7c63f2f73 100644
index 7cb48eb05..bad6361fb 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -1104,6 +1104,15 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -25,7 +25,7 @@ index 0d815a7b0c..b7c63f2f73 100644
chunk.clearAllBlockEntities();
chunk.unregisterTickContainerFromLevel(this);
}
@@ -1994,6 +2003,13 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1996,6 +2005,13 @@ public class WorldServer extends World implements GeneratorAccessSeed {
public void onTrackingEnd(Entity entity) {
org.spigotmc.AsyncCatcher.catchOp("entity unregister"); // Spigot

8
CraftBukkit-Patches/0022-Entity-Mount-and-Dismount-Events.patch
View file

@ -1,14 +1,14 @@
From c78a7d683454aa6477a85fb53396c5301d6974ea Mon Sep 17 00:00:00 2001
From 6fa7ef3755f9f2e59e10ec87006c925705f16388 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 27 Feb 2016 10:07:58 +1100
Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index c824c7cf58..88eb89c3d5 100644
index afbc2b86e..8502925b8 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2339,6 +2339,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -2364,6 +2364,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
}
// CraftBukkit end
@ -25,7 +25,7 @@ index c824c7cf58..88eb89c3d5 100644
if (this.isPassenger()) {
this.stopRiding();
}
@@ -2426,6 +2436,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -2451,6 +2461,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
}
// CraftBukkit end

6
CraftBukkit-Patches/0025-Implement-respawn-API.patch
View file

@ -1,14 +1,14 @@
From 07cfff1107cc5d303c183243138b4baf0fc69ed5 Mon Sep 17 00:00:00 2001
From d06a2979541294004bf4a8b02ea201862523d537 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 539ba62c5..57d4ffbdc 100644
index 53952c2f0..64475bb92 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2160,6 +2160,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2162,6 +2162,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

6
CraftBukkit-Patches/0029-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From 8e32681c2477dcccd96df56b2cec81a18a34c020 Mon Sep 17 00:00:00 2001
From c8c139904d1672fe1254300bfb1db2b0c125aecc Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -207,10 +207,10 @@ index b79f9163b..4868f4a06 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 57d4ffbdc..41874a4b3 100644
index 64475bb92..7d2d3464b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2161,6 +2161,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2163,6 +2163,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private final Player.Spigot spigot = new Player.Spigot()
{

8
CraftBukkit-Patches/0033-Save-ticks-lived-to-nbttag.patch
View file

@ -1,14 +1,14 @@
From 8bf54f929ba94cfac6145579d64c0108f0f610ce Mon Sep 17 00:00:00 2001
From ef94ecd762b70f7ddf6e82ff4353d93cf1270e68 Mon Sep 17 00:00:00 2001
From: DerFlash <bte@freenet.de>
Date: Tue, 9 Jul 2013 00:11:12 +0200
Subject: [PATCH] Save ticks lived to nbttag
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 88eb89c3d5..dba6709609 100644
index 8502925b8..346f2d505 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1944,6 +1944,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -1963,6 +1963,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
if (maxAirTicks != getDefaultMaxAirSupply()) {
nbttagcompound.putInt("Bukkit.MaxAirSupply", getMaxAirSupply());
}
@ -16,7 +16,7 @@ index 88eb89c3d5..dba6709609 100644
// CraftBukkit end
IChatBaseComponent ichatbasecomponent = this.getCustomName();
@@ -2102,6 +2103,11 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -2121,6 +2122,11 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
// CraftBukkit start

6
CraftBukkit-Patches/0035-Disable-Connected-Check-on-setScoreboard.patch
View file

@ -1,14 +1,14 @@
From 1f336bfb5005106b1efd5f03bb3af2b58bd57db7 Mon Sep 17 00:00:00 2001
From b57df252cae791c46126286b016122eccb617cbf Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 23 Dec 2013 15:57:57 +1100
Subject: [PATCH] Disable Connected Check on setScoreboard
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8075fb784e..87e5d84494 100644
index 7d2d3464b..a0ebd7a46 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1894,7 +1894,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1896,7 +1896,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setScoreboard(Scoreboard scoreboard) {
Preconditions.checkArgument(scoreboard != null, "Scoreboard cannot be null");
Preconditions.checkState(getHandle().connection != null, "Cannot set scoreboard yet (invalid player connection)");

6
CraftBukkit-Patches/0045-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From 2d1f0b8b1ab76a532d611712523db636e8b303fe Mon Sep 17 00:00:00 2001
From dc10e9bb6d7ed99e2b07953f0eefcff9b204c556 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Sun, 9 Feb 2014 14:03:03 -0500
Subject: [PATCH] Add support for fetching hidden players
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 68ed49375..a1fb14b72 100644
index a0ebd7a46..dc480478b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2175,6 +2175,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2177,6 +2177,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().respawn( getHandle(), false, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.PLUGIN );
}
}

6
CraftBukkit-Patches/0047-Implement-Silenceable-Lightning-API.patch
View file

@ -1,4 +1,4 @@
From 612211fdaaad4f85c6e89dac8092365a1e356f0c Mon Sep 17 00:00:00 2001
From 0cd60c799b4554f1b15deb1573a11ecb77226593 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sun, 23 Feb 2014 16:16:59 -0400
Subject: [PATCH] Implement Silenceable Lightning API
@ -26,10 +26,10 @@ index 5fae741e7..ecba56d2e 100644
this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEffects.LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F, false);
this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEffects.LIGHTNING_BOLT_IMPACT, SoundCategory.WEATHER, 2.0F, 0.5F + this.random.nextFloat() * 0.2F, false);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index bbce80b7b..27399bc38 100644
index 7f646490c..4aa6fffb6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1973,6 +1973,27 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2005,6 +2005,27 @@ public class CraftWorld extends CraftRegionAccessor implements World {
// Spigot start
private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
{

6
CraftBukkit-Patches/0066-Prevent-a-crash-involving-attributes.patch
View file

@ -1,14 +1,14 @@
From e7ae33af39c8807fd93d375884f67a7ab54c16d6 Mon Sep 17 00:00:00 2001
From 166a374acd443273f2de9125b790d110bb6da68e Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 19:54:41 +0100
Subject: [PATCH] Prevent a crash involving attributes
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 50d9c44e65..fcb02f43bf 100644
index dc480478b..62cff5e2a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1981,7 +1981,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1983,7 +1983,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> { });

6
CraftBukkit-Patches/0072-Plug-WorldMap-Memory-Leak.patch
View file

@ -1,14 +1,14 @@
From 7d9921c3fad6934713ce6f4d2ee645dcc08afcf7 Mon Sep 17 00:00:00 2001
From 169cdf7db763c5044a4499f631ca4390049ecb9b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 8 Aug 2014 19:57:03 +1000
Subject: [PATCH] Plug WorldMap Memory Leak
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index b7c63f2f73..2c4a29f245 100644
index bad6361fb..2080b79ec 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -2003,6 +2003,29 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -2005,6 +2005,29 @@ public class WorldServer extends World implements GeneratorAccessSeed {
public void onTrackingEnd(Entity entity) {
org.spigotmc.AsyncCatcher.catchOp("entity unregister"); // Spigot

12
CraftBukkit-Patches/0078-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From 340c9aa1c71acb6ad71d573abf28b21ccf24cfa1 Mon Sep 17 00:00:00 2001
From 27820fc4fbb3bcde342498a98db98702a04fa30b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 13 Dec 2014 03:06:05 +0100
Subject: [PATCH] BungeeCord Chat API
@ -105,10 +105,10 @@ index 74558e852..13008357b 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 1e6b8dec5..14e465868 100644
index f15922dbe..1471bd3f4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -196,6 +196,8 @@ import org.bukkit.util.BoundingBox;
@@ -200,6 +200,8 @@ import org.bukkit.util.BoundingBox;
import org.bukkit.util.NumberConversions;
import org.bukkit.util.Vector;
@ -117,7 +117,7 @@ index 1e6b8dec5..14e465868 100644
public abstract class CraftEntity implements org.bukkit.entity.Entity {
private static PermissibleBase perm;
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
@@ -1174,6 +1176,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1214,6 +1216,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
// Spigot start
private final org.bukkit.entity.Entity.Spigot spigot = new org.bukkit.entity.Entity.Spigot()
{
@ -145,7 +145,7 @@ index 1e6b8dec5..14e465868 100644
public org.bukkit.entity.Entity.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 4311aa4ba..df4f86073 100644
index 62cff5e2a..8e03e4017 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -180,6 +180,8 @@ import org.bukkit.profile.PlayerProfile;
@ -157,7 +157,7 @@ index 4311aa4ba..df4f86073 100644
@DelegateDeserialization(CraftOfflinePlayer.class)
public class CraftPlayer extends CraftHumanEntity implements Player {
private long firstPlayed = 0;
@@ -2198,6 +2200,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2200,6 +2202,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}

8
CraftBukkit-Patches/0084-Remove-DataWatcher-Locking.patch
View file

@ -1,4 +1,4 @@
From 44655a1c1c10a07ec37b9c7f80a17a3757fd8d71 Mon Sep 17 00:00:00 2001
From 7fd02b020d3b5850b8428dcc09ee883c03f91776 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 9 Jul 2019 02:18:54 -0700
Subject: [PATCH] Remove DataWatcher Locking
@ -17,7 +17,7 @@ This patch also changes the entries map to be fastutil
int2objectopenhashmap for performance.
diff --git a/src/main/java/net/minecraft/network/syncher/DataWatcher.java b/src/main/java/net/minecraft/network/syncher/DataWatcher.java
index ac10ddf352..78d4756490 100644
index ac10ddf35..78d475649 100644
--- a/src/main/java/net/minecraft/network/syncher/DataWatcher.java
+++ b/src/main/java/net/minecraft/network/syncher/DataWatcher.java
@@ -36,7 +36,7 @@ public class DataWatcher {
@ -122,10 +122,10 @@ index ac10ddf352..78d4756490 100644
this.entity.onSyncedDataUpdated(list);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index dba6709609..2c22e5122d 100644
index 346f2d505..18328fab0 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -370,6 +370,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -371,6 +371,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
this.entityData.define(Entity.DATA_POSE, EntityPose.STANDING);
this.entityData.define(Entity.DATA_TICKS_FROZEN, 0);
this.defineSynchedData();