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

Rebuild patches

Browse source
This commit is contained in:
md_5 2023-03-04 09:42:36 +11:00
parent a2190e302d
commit 454acb73c8
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
22 changed files with 98 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 7f188ece537d7a53a9ae42aa9f60fdae10b69c94 Mon Sep 17 00:00:00 2001
From 1ddc2a380e1a16a4e6257de5e1f8c5b327892d0e 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
@ -75,10 +75,10 @@ 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 b8b966b0..8489a0b0 100644
index 2570b335..281518d6 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -673,4 +673,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -699,4 +699,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull
SpawnCategory getSpawnCategory();
@ -120,10 +120,10 @@ index 76aad05f..4d308c5a 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9b2a9516..67c8d7b2 100644
index 0c377ac3..f0ce49c4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1637,4 +1637,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1668,4 +1668,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 3aaa1be6ba12310c5231a150fbb42942b6a9c93d Mon Sep 17 00:00:00 2001
From 8a54430b6c78e99d7435da454381720e8046d15b 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 67c8d7b2..6204f28b 100644
index f0ce49c4..c31151be 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1641,6 +1641,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1672,6 +1672,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Spigot start
public class Spigot extends Entity.Spigot {

6
Bukkit-Patches/0007-Player-Collision-API.patch
View file

@ -1,14 +1,14 @@
From a67f807869c2720608c586fc457637634a6ad237 Mon Sep 17 00:00:00 2001
From 72ea513b4213d7d8efda3390125e380b0ea1abcf Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 3 Aug 2013 19:20:50 +1000
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 6204f28b..4d555ba8 100644
index c31151be..4c234fba 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1651,6 +1651,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1682,6 +1682,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public InetSocketAddress getRawAddress() {
throw new UnsupportedOperationException("Not supported yet.");
}

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

@ -1,14 +1,14 @@
From cc348256d337cdf5be85acf98ca93fe66c4d0352 Mon Sep 17 00:00:00 2001
From defb540533d73261cba4b50bf8ce435873796438 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 4d555ba8..457aa80c 100644
index 4c234fba..b08ead82 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1674,6 +1674,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1705,6 +1705,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void setCollidesWithEntities(boolean collides) {
throw new UnsupportedOperationException("Not supported yet.");
}

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

@ -1,14 +1,14 @@
From d0ef5124bc913ea4bb78a2bfa2df025dbacf5678 Mon Sep 17 00:00:00 2001
From e10d061f5797d93a63973191e1e24eb5c5a3c771 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 457aa80c..f3c88991 100644
index b08ead82..1eb88727 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1681,6 +1681,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1712,6 +1712,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void respawn() {
throw new UnsupportedOperationException("Not supported yet.");
}

6
Bukkit-Patches/0012-Undeprecate-Player-updateInventory-V.patch
View file

@ -1,14 +1,14 @@
From 5467d5b08912b3ecfae363fdfe01060ac7931168 Mon Sep 17 00:00:00 2001
From 801d6f426cc95fa8af9b1cbd4fc281c6fa4d2093 Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu>
Date: Wed, 23 Jul 2014 15:50:36 -0400
Subject: [PATCH] Undeprecate Player#updateInventory()V
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f3c88991..a84f9bac 100644
index 1eb88727..7615502d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -640,10 +640,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -671,10 +671,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
/**
* Forces an update of the player's entire inventory.
*

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

@ -1,4 +1,4 @@
From 96e71fde458486050e18fdbda8d362aec6650ec9 Mon Sep 17 00:00:00 2001
From b2f9d6eeb3517eb6b74cdf2e2e5e1106da6ef308 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
@ -370,10 +370,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 a84f9bac..9f49dc05 100644
index 7615502d..c60e1fc1 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1689,6 +1689,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1720,6 +1720,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public java.util.Set<Player> getHiddenPlayers() {
throw new UnsupportedOperationException("Not supported yet.");
}

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

@ -1,4 +1,4 @@
From d9a6fd8d2c4121a7dbb79a59c7895e1f5ed55e00 Mon Sep 17 00:00:00 2001
From f9d58693540bf3ec036b1f8c1009f884e83ed2c0 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
@ -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 c68bda925..6823e6241 100644
index 13a219b1e..ef0631dac 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1116,4 +1116,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1141,4 +1141,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
return perm;
}
@ -124,10 +124,10 @@ index 9ab9f0a31..e63833dcd 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 7bfea1927..d8cb6d320 100644
index 41206e697..c934c5fe3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1975,4 +1975,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2049,4 +2049,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean isAllowingServerListings() {
return getHandle().allowsListing();
}

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

@ -1,4 +1,4 @@
From 8798edf79ad5fde44bd92e8ff3df50fa7aa2dfcb Mon Sep 17 00:00:00 2001
From d102617badeda6516876efc08a8c756670ca0256 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
@ -122,7 +122,7 @@ index 57ff7fdd0..30bbab347 100644
world.removeBlockEntity(blockposition);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 634c9a75c..f580a922b 100644
index 9aecbbbe9..bd6253f5e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -822,6 +822,7 @@ public final class CraftServer implements Server {
@ -134,7 +134,7 @@ index 634c9a75c..f580a922b 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 19242d0f6..8e7e4fd96 100644
index e2315b7ca..c1f9c82d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -264,6 +264,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@ -186,10 +186,10 @@ index 19242d0f6..8e7e4fd96 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 6823e6241..7cfe6f175 100644
index ef0631dac..de528e88d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -553,6 +553,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -554,6 +554,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,10 +198,10 @@ index 6823e6241..7cfe6f175 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 ccd66b1ac..1c3003c44 100644
index c934c5fe3..a8215de47 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -367,6 +367,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -368,6 +368,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {

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

@ -1,4 +1,4 @@
From c138ba71f2d48d4ada03fa6a78f294ae5e1abd56 Mon Sep 17 00:00:00 2001
From 1739590f402e2ed84d72f7ddc0f66020504f11bf 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
@ -278,7 +278,7 @@ index a15db94b4..46e80b4d0 100644
}
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index c079a8e6d..b1f441cf3 100644
index e9b49a482..0777ed940 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -335,6 +335,7 @@ public class PlayerConnection implements ServerPlayerConnection, TickablePacketL
@ -323,7 +323,7 @@ index c079a8e6d..b1f441cf3 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 6430a150f..26ab3384c 100644
index 40eb0ff5e..f9029a84e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -134,6 +134,7 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@ -334,7 +334,7 @@ index 6430a150f..26ab3384c 100644
import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
@@ -300,6 +301,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -301,6 +302,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;
@ -342,7 +342,7 @@ index 6430a150f..26ab3384c 100644
public float getBukkitYaw() {
return this.yRot;
@@ -730,6 +732,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -731,6 +733,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
public void move(EnumMoveType enummovetype, Vec3D vec3d) {
@ -350,7 +350,7 @@ index 6430a150f..26ab3384c 100644
if (this.noPhysics) {
this.setPos(this.getX() + vec3d.x, this.getY() + vec3d.y, this.getZ() + vec3d.z);
} else {
@@ -893,6 +896,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -894,6 +897,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
this.level.getProfiler().pop();
}
}

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

@ -1,4 +1,4 @@
From 3b57a3443f3fa46e8cc9424a317e373ca12d6a25 Mon Sep 17 00:00:00 2001
From dcccf53added4d51351f28cb85ff1c48576afaa7 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
@ -35,10 +35,10 @@ index 46e80b4d0..f67a69ae3 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 26ab3384c..057032960 100644
index f9029a84e..e30c28602 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -302,6 +302,12 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -303,6 +303,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 26ab3384c..057032960 100644
public float getBukkitYaw() {
return this.yRot;
@@ -337,6 +343,13 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -338,6 +344,13 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
this.position = Vec3D.ZERO;
this.blockPosition = BlockPosition.ZERO;
this.chunkPosition = ChunkCoordIntPair.ZERO;

28
CraftBukkit-Patches/0016-Hopper-Customisations.patch
View file

@ -1,4 +1,4 @@
From 4f56d778991659528abf4e254d6ad022ce8d321d Mon Sep 17 00:00:00 2001
From dfbeac93bad8dacd6e9dadb28c2dba50d5a134cb Mon Sep 17 00:00:00 2001
From: erocs <github@erocs.org>
Date: Sun, 8 Sep 2013 12:06:15 -0700
Subject: [PATCH] Hopper Customisations
@ -6,10 +6,10 @@ Subject: [PATCH] Hopper Customisations
Allows editing hopper cooldowns and amount transferred per tick.
diff --git a/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java b/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java
index 80cbb3f6c..25cc1cca6 100644
index dbc2da380..42a1f96f2 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/TileEntityHopper.java
@@ -140,9 +140,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -143,9 +143,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
tileentityhopper.tickedGameTime = world.getGameTime();
if (!tileentityhopper.isOnCooldown()) {
tileentityhopper.setCooldown(0);
@ -25,7 +25,7 @@ index 80cbb3f6c..25cc1cca6 100644
}
}
@@ -163,7 +168,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -166,7 +171,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
}
if (flag) {
@ -34,7 +34,7 @@ index 80cbb3f6c..25cc1cca6 100644
setChanged(world, blockposition, iblockdata);
return true;
}
@@ -206,7 +211,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -209,7 +214,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
// ItemStack itemstack1 = addItem(iinventory, iinventory1, iinventory.removeItem(i, 1), enumdirection);
// CraftBukkit start - Call event when pushing items into other inventories
@ -43,7 +43,7 @@ index 80cbb3f6c..25cc1cca6 100644
Inventory destinationInventory;
// Have to special case large chests as they work oddly
@@ -220,9 +225,10 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -225,9 +230,10 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
world.getCraftServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
hopper.setItem(i, itemstack);
@ -55,7 +55,7 @@ index 80cbb3f6c..25cc1cca6 100644
ItemStack itemstack1 = addItem(iinventory, iinventory1, CraftItemStack.asNMSCopy(event.getItem()), enumdirection);
// CraftBukkit end
@@ -231,6 +237,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -236,6 +242,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
return true;
}
@ -63,7 +63,7 @@ index 80cbb3f6c..25cc1cca6 100644
iinventory.setItem(i, itemstack);
}
}
@@ -265,7 +272,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -270,7 +277,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
EnumDirection enumdirection = EnumDirection.DOWN;
return isEmptyContainer(iinventory, enumdirection) ? false : getSlots(iinventory, enumdirection).anyMatch((i) -> {
@ -72,7 +72,7 @@ index 80cbb3f6c..25cc1cca6 100644
});
} else {
Iterator iterator = getItemsAtAndAbove(world, ihopper).iterator();
@@ -284,14 +291,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -289,14 +296,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
}
}
@ -89,7 +89,7 @@ index 80cbb3f6c..25cc1cca6 100644
Inventory sourceInventory;
// Have to special case large chests as they work oddly
@@ -308,13 +315,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -315,13 +322,13 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
iinventory.setItem(i, itemstack1);
if (ihopper instanceof TileEntityHopper) {
@ -106,7 +106,7 @@ index 80cbb3f6c..25cc1cca6 100644
ItemStack itemstack2 = addItem(iinventory, ihopper, CraftItemStack.asNMSCopy(event.getItem()), null);
// CraftBukkit end
@@ -323,6 +330,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -330,6 +337,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
return true;
}
@ -114,7 +114,7 @@ index 80cbb3f6c..25cc1cca6 100644
iinventory.setItem(i, itemstack1);
}
@@ -386,6 +394,11 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -393,6 +401,11 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
boolean flag1 = iinventory1.isEmpty();
if (itemstack1.isEmpty()) {
@ -126,7 +126,7 @@ index 80cbb3f6c..25cc1cca6 100644
iinventory1.setItem(i, itemstack);
itemstack = ItemStack.EMPTY;
flag = true;
@@ -413,7 +426,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -420,7 +433,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
}
}
@ -135,7 +135,7 @@ index 80cbb3f6c..25cc1cca6 100644
}
}
@@ -451,6 +464,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -482,6 +495,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
private static IInventory getContainerAt(World world, double d0, double d1, double d2) {
Object object = null;
BlockPosition blockposition = new BlockPosition(d0, d1, d2);

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

@ -1,14 +1,14 @@
From 2a356d0d4b9a2c2ce7b3a747712232c9a0393059 Mon Sep 17 00:00:00 2001
From 1c558581e06c698871573acf66512141a58112e9 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 057032960..e3751b64a 100644
index e30c28602..945403674 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2249,6 +2249,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -2254,6 +2254,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
}
// CraftBukkit end
@ -25,7 +25,7 @@ index 057032960..e3751b64a 100644
if (this.passengers.isEmpty()) {
this.passengers = ImmutableList.of(entity);
} else {
@@ -2290,6 +2300,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -2295,6 +2305,16 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
}
// CraftBukkit end

6
CraftBukkit-Patches/0024-Player-Collision-API.patch
View file

@ -1,14 +1,14 @@
From 111edff5704729ef525ea2bc6dc4f22379b40386 Mon Sep 17 00:00:00 2001
From 04702c8d5f77249cdeb19e9a8f0e15fa114153cb Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 27 Mar 2016 20:35:09 +1100
Subject: [PATCH] Player Collision API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 80a252164..656c2bcf6 100644
index a8215de47..5279e301e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1980,6 +1980,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2054,6 +2054,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

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

@ -1,14 +1,14 @@
From 3b04650c7bf7d8fe934173766f564d47d13d0f30 Mon Sep 17 00:00:00 2001
From 84fc3e3c9ba835cb300b8a711f318d8f1a0d07c1 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 656c2bcf6..6b6b5b8f8 100644
index 5279e301e..a8389a422 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1990,6 +1990,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2064,6 +2064,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setCollidesWithEntities(boolean collides) {
CraftPlayer.this.setCollidable(collides);
}

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

@ -1,4 +1,4 @@
From d745c20b8e0e8145ca0848d41d8035f7a7a61251 Mon Sep 17 00:00:00 2001
From 38df3a95168f30717c2c462134c7ed8e7ba53a9a 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
@ -187,10 +187,10 @@ index 069f2ca99..2d16e81aa 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 6b6b5b8f8..7670a6dab 100644
index a8389a422..b31cc26f4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1981,6 +1981,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2055,6 +2055,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private final Player.Spigot spigot = new Player.Spigot()
{

10
CraftBukkit-Patches/0034-Save-ticks-lived-to-nbttag.patch
View file

@ -1,14 +1,14 @@
From 4667cd7613d03b3a57c0696f6cce13ca3ad9f174 Mon Sep 17 00:00:00 2001
From 7b38e2225e3c0dff826479b8c4b2ee7b05dc0d56 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 e3751b64a..0de06abed 100644
index 945403674..bcd20ed56 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1802,6 +1802,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -1806,6 +1806,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
if (maxAirTicks != getDefaultMaxAirSupply()) {
nbttagcompound.putInt("Bukkit.MaxAirSupply", getMaxAirSupply());
}
@ -16,7 +16,7 @@ index e3751b64a..0de06abed 100644
// CraftBukkit end
IChatBaseComponent ichatbasecomponent = this.getCustomName();
@@ -1960,6 +1961,11 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -1964,6 +1965,11 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
// CraftBukkit start
@ -26,8 +26,8 @@ index e3751b64a..0de06abed 100644
+ }
+ // Spigot end
this.persist = !nbttagcompound.contains("Bukkit.persist") || nbttagcompound.getBoolean("Bukkit.persist");
this.visibleByDefault = !nbttagcompound.contains("Bukkit.visibleByDefault") || nbttagcompound.getBoolean("Bukkit.visibleByDefault");
// SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
if (nbttagcompound.contains("Bukkit.MaxAirSupply")) {
--
2.34.1

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

@ -1,14 +1,14 @@
From febdb2ae8d980ef937144a03d502c7616595b587 Mon Sep 17 00:00:00 2001
From fdf90465e8329df42420ccfdae72a6801bf3bfab 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 7670a6dab..b7792c527 100644
index b31cc26f4..27c38eb68 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1727,7 +1727,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1801,7 +1801,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
throw new IllegalStateException("Cannot set scoreboard yet");
}
if (playerConnection.isDisconnected()) {

13
CraftBukkit-Patches/0046-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From a6cc9d5691ef30e845a3de46d0ae6705f129bcef Mon Sep 17 00:00:00 2001
From 1d53831c565a64a22dc48cddbb6632492ee002b6 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 b7792c527..d3c0a0acb 100644
index 27c38eb68..2e6811fda 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2005,6 +2005,22 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2079,6 +2079,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().respawn( getHandle(), false );
}
}
@ -16,11 +16,10 @@ index b7792c527..d3c0a0acb 100644
+ @Override
+ public Set<Player> getHiddenPlayers()
+ {
+ Set<Player> ret = new HashSet<Player>();
+ for ( UUID u : hiddenEntities.keySet() )
+ Set<Player> ret = new HashSet<>();
+ for ( Player p : getServer().getOnlinePlayers() )
+ {
+ Player p = getServer().getPlayer( u );
+ if ( p != null )
+ if ( !CraftPlayer.this.canSee(p) )
+ {
+ ret.add( p );
+ }

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

@ -1,14 +1,14 @@
From 7e4097ca6e0b9df7b597efb9eab661e4e49b3cef Mon Sep 17 00:00:00 2001
From c1bdb34acb1050bda728df08eefedea8f3a3d52f 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 d3c0a0acb..8d42d1575 100644
index d646fc21b..2699d5231 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1808,7 +1808,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1882,7 +1882,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> { });

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

@ -1,4 +1,4 @@
From 82023d681c5fe02dbeb7d78fd8e88f90c181f9f1 Mon Sep 17 00:00:00 2001
From 6db39807af15072ad9da966813e4958e4c70f774 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,7 +105,7 @@ 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 7cfe6f175..9aaa7e1ac 100644
index de528e88d..059a16676 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
@ -116,7 +116,7 @@ index 7cfe6f175..9aaa7e1ac 100644
import net.minecraft.core.BlockPosition;
import net.minecraft.core.Position;
import net.minecraft.nbt.NBTBase;
@@ -1121,6 +1122,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1146,6 +1147,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()
{
@ -144,10 +144,10 @@ index 7cfe6f175..9aaa7e1ac 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 8d42d1575..0a9086f1d 100644
index 5f364f538..62867ebe1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -157,6 +157,8 @@ import org.bukkit.plugin.messaging.StandardMessenger;
@@ -158,6 +158,8 @@ import org.bukkit.plugin.messaging.StandardMessenger;
import org.bukkit.profile.PlayerProfile;
import org.bukkit.scoreboard.Scoreboard;
@ -156,7 +156,7 @@ index 8d42d1575..0a9086f1d 100644
@DelegateDeserialization(CraftOfflinePlayer.class)
public class CraftPlayer extends CraftHumanEntity implements Player {
private long firstPlayed = 0;
@@ -2029,6 +2031,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2102,6 +2104,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}

6
CraftBukkit-Patches/0086-Remove-DataWatcher-Locking.patch
View file

@ -1,4 +1,4 @@
From 04735164d3ef75f877c745eaeff929fdb64fb447 Mon Sep 17 00:00:00 2001
From 4366e19b580218bffb50a7ea8acf21059e200e2b 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
@ -118,10 +118,10 @@ index 80fb97fe4..d9252e828 100644
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 0de06abed..cb083b824 100644
index bcd20ed56..b37edf010 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -360,6 +360,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -361,6 +361,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();