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

Rebuild patches

Browse source
This commit is contained in:
md_5 2024-02-21 20:58:05 +11:00
parent c198da22a8
commit f1b62e0c3f
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
87 changed files with 428 additions and 428 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Bukkit-Patches/0001-POM-Changes.patch
View file

@ -1,11 +1,11 @@
From f0cc86274ee13f62e9e89a9dbb62737b1e79cf08 Mon Sep 17 00:00:00 2001
From d90893ee2239326c984c4b6a79ebe5e5b7f94edd Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 2 Jun 2013 10:36:24 +1000
Subject: [PATCH] POM Changes
diff --git a/checkstyle.xml b/checkstyle.xml
index 4b261543..3e7d0cb3 100644
index 4b2615435..3e7d0cb3a 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -45,6 +45,10 @@
@ -20,7 +20,7 @@ index 4b261543..3e7d0cb3 100644
<!-- See http://checkstyle.sourceforge.net/config_imports.html -->
<module name="AvoidStarImport">
diff --git a/pom.xml b/pom.xml
index 2daa4be2..e98ed55d 100644
index fe7ecda44..4d2bfb4ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
@ -43,5 +43,5 @@ index 2daa4be2..e98ed55d 100644
<properties>
<skipTests>true</skipTests>
--
2.43.0
2.43.2

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

@ -1,14 +1,14 @@
From b086203c843ba9a5da191510163d85ae2b0f5649 Mon Sep 17 00:00:00 2001
From 8b4ce29e4a9a5ac48520ec78bb49e5867cca5e33 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
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 34cdaaf9..6a8f1c73 100644
index 3f2656d04..81be98ab3 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2093,4 +2093,9 @@ public final class Bukkit {
@@ -2113,4 +2113,9 @@ public final class Bukkit {
public static UnsafeValues getUnsafe() {
return server.getUnsafe();
}
@ -19,10 +19,10 @@ index 34cdaaf9..6a8f1c73 100644
+ }
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 30e1fbae..44e527c6 100644
index 1b151e6fa..331646da8 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1786,4 +1786,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1802,4 +1802,13 @@ public interface Server extends PluginMessageRecipient {
@Deprecated
@NotNull
UnsafeValues getUnsafe();
@ -37,10 +37,10 @@ index 30e1fbae..44e527c6 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 9a411793..e3897aab 100644
index 488327daa..2abcf42f5 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2735,6 +2735,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2776,6 +2776,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
@ -57,7 +57,7 @@ index 9a411793..e3897aab 100644
* Find the closest nearby location with a biome matching the provided
* {@link Biome}(s). Finding biomes can, and will, block if the world is looking
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
index a7a2587b..4b6b9540 100644
index a7a2587b4..4b6b95404 100644
--- a/src/main/java/org/bukkit/command/CommandSender.java
+++ b/src/main/java/org/bukkit/command/CommandSender.java
@@ -53,4 +53,13 @@ public interface CommandSender extends Permissible {
@ -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 69ba14b6..8532b848 100644
index dcd2b5097..53450c104 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -758,4 +758,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -755,4 +755,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@NotNull
@ApiStatus.Experimental
Entity copy(@NotNull Location to);
@ -94,7 +94,7 @@ index 69ba14b6..8532b848 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
index 158ac20f..d913298e 100644
index 158ac20f8..d913298ea 100644
--- a/src/main/java/org/bukkit/entity/LightningStrike.java
+++ b/src/main/java/org/bukkit/entity/LightningStrike.java
@@ -2,6 +2,7 @@ package org.bukkit.entity;
@ -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 246acd6e..2b3e490a 100644
index 402424292..bc729e0e3 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2041,4 +2041,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2150,4 +2150,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return whether the player allows server listings
*/
public boolean isAllowingServerListings();
@ -139,7 +139,7 @@ index 246acd6e..2b3e490a 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
index d650da50..f740bebe 100644
index d650da50e..f740bebee 100644
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
@@ -185,4 +185,13 @@ public interface BookMeta extends ItemMeta {
@ -157,5 +157,5 @@ index d650da50..f740bebe 100644
+ // Spigot end
}
--
2.43.0
2.43.2

26
Bukkit-Patches/0003-Spigot-Timings.patch
View file

@ -1,4 +1,4 @@
From 0083f0bd7f088cbfde9cbf84a45f52e640f054d3 Mon Sep 17 00:00:00 2001
From 305b458b4e55fb95e7791371188c3dde30d083d5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 2 Jun 2013 10:42:57 +1000
Subject: [PATCH] Spigot Timings
@ -8,10 +8,10 @@ Adds performance tracking timings all around the Minecraft Server, and improves
Plugins can track their own timings with CustomTimingsHandler
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 6a8f1c73..5680a77c 100644
index 81be98ab3..2e619279c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -842,6 +842,7 @@ public final class Bukkit {
@@ -862,6 +862,7 @@ public final class Bukkit {
*/
public static void reload() {
server.reload();
@ -20,10 +20,10 @@ index 6a8f1c73..5680a77c 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 44e527c6..810f0420 100644
index 331646da8..b20d1e8fb 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1790,6 +1790,10 @@ public interface Server extends PluginMessageRecipient {
@@ -1806,6 +1806,10 @@ public interface Server extends PluginMessageRecipient {
// Spigot start
public class Spigot {
@ -35,7 +35,7 @@ index 44e527c6..810f0420 100644
@NotNull
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index 0577d80a..80209bb8 100644
index 0577d80a2..80209bb88 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -33,6 +33,7 @@ public abstract class Command {
@ -63,7 +63,7 @@ index 0577d80a..80209bb8 100644
return true;
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 73906146..e195e74c 100644
index 73906146e..e195e74c4 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -144,11 +144,15 @@ public class SimpleCommandMap implements CommandMap {
@ -83,7 +83,7 @@ index 73906146..e195e74c 100644
}
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
index ed4cbce7..516d7fc7 100644
index ed4cbce77..516d7fc78 100644
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
@@ -18,23 +18,102 @@ import org.bukkit.plugin.TimedRegisteredListener;
@ -245,7 +245,7 @@ index ed4cbce7..516d7fc7 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 1fe7249d..a69c5d5c 100644
index 1fe7249d3..a69c5d5ca 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -358,6 +358,7 @@ public final class SimplePluginManager implements PluginManager {
@ -257,7 +257,7 @@ index 1fe7249d..a69c5d5c 100644
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 39b991ff..047c0304 100644
index 39b991ff7..047c0304f 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -43,6 +43,7 @@ import org.bukkit.plugin.TimedRegisteredListener;
@ -308,7 +308,7 @@ index 39b991ff..047c0304 100644
eventSet.add(new RegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
new file mode 100644
index 00000000..44badfed
index 000000000..44badfedc
--- /dev/null
+++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
@@ -0,0 +1,137 @@
@ -451,7 +451,7 @@ index 00000000..44badfed
+}
diff --git a/src/main/java/org/spigotmc/package-info.java b/src/main/java/org/spigotmc/package-info.java
new file mode 100644
index 00000000..a287faff
index 000000000..a287faff5
--- /dev/null
+++ b/src/main/java/org/spigotmc/package-info.java
@@ -0,0 +1,4 @@
@ -460,5 +460,5 @@ index 00000000..a287faff
+ */
+package org.spigotmc;
--
2.43.0
2.43.2

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

@ -1,14 +1,14 @@
From 430e932e9e52168d7ba600dc0e6f672060ca8965 Mon Sep 17 00:00:00 2001
From 55da1753f7f1fce980a770db3360ed0596cc6242 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
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 2b3e490a..c5f6bae4 100644
index bc729e0e3..37e1f8448 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2045,6 +2045,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2154,6 +2154,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Spigot start
public class Spigot extends Entity.Spigot {
@ -26,5 +26,5 @@ index 2b3e490a..c5f6bae4 100644
@NotNull
--
2.43.0
2.43.2

10
Bukkit-Patches/0005-Entity-Mount-and-Dismount-Events.patch
View file

@ -1,4 +1,4 @@
From 78ac3f15ac47a0f6217af36b1e169c62d17031f5 Mon Sep 17 00:00:00 2001
From 57f774fa154be38e6d9ca68b3108fe09976dd05a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 2 Jul 2013 20:32:53 +1000
Subject: [PATCH] Entity Mount and Dismount Events
@ -6,7 +6,7 @@ Subject: [PATCH] Entity Mount and Dismount Events
diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
new file mode 100644
index 00000000..be9560ff
index 000000000..be9560ffa
--- /dev/null
+++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java
@@ -0,0 +1,55 @@
@ -67,7 +67,7 @@ index 00000000..be9560ff
+}
diff --git a/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java
new file mode 100644
index 00000000..b1b21227
index 000000000..b1b21227b
--- /dev/null
+++ b/src/main/java/org/spigotmc/event/entity/EntityMountEvent.java
@@ -0,0 +1,55 @@
@ -128,7 +128,7 @@ index 00000000..b1b21227
+}
diff --git a/src/main/java/org/spigotmc/event/entity/package-info.java b/src/main/java/org/spigotmc/event/entity/package-info.java
new file mode 100644
index 00000000..264664eb
index 000000000..264664eb9
--- /dev/null
+++ b/src/main/java/org/spigotmc/event/entity/package-info.java
@@ -0,0 +1,4 @@
@ -137,5 +137,5 @@ index 00000000..264664eb
+ */
+package org.spigotmc.event.entity;
--
2.43.0
2.43.2

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

@ -1,14 +1,14 @@
From 0fe2f6da41133d9916331a7f8158e623f4af4b10 Mon Sep 17 00:00:00 2001
From 4bfc5d9711651801a135bc3a4418863ceafa33e9 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 c5f6bae4..bee0d3ba 100644
index 37e1f8448..b053e6aa4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2055,6 +2055,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2164,6 +2164,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public InetSocketAddress getRawAddress() {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -23,5 +23,5 @@ index c5f6bae4..bee0d3ba 100644
@NotNull
--
2.43.0
2.43.2

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

@ -1,14 +1,14 @@
From 992f2629c88961aadf908554b8cd104e70a6d18c Mon Sep 17 00:00:00 2001
From a55132e1028d73079227fe83ce65740b2f28e152 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 bee0d3ba..8ad4d88c 100644
index b053e6aa4..c0583fd1b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2062,6 +2062,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2171,6 +2171,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void respawn() {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -26,5 +26,5 @@ index bee0d3ba..8ad4d88c 100644
@NotNull
--
2.43.0
2.43.2

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

@ -1,14 +1,14 @@
From ce9555726679c98813d0d8154233761a6ef94621 Mon Sep 17 00:00:00 2001
From f791d4528e5540e8e72eace01fd5499257917fed 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 e3897aab..d453a975 100644
index 2abcf42f5..0fd2e9ee1 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2738,6 +2738,35 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -2779,6 +2779,35 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
// Spigot start
public class Spigot {
@ -45,7 +45,7 @@ index e3897aab..d453a975 100644
@NotNull
diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
index d913298e..b27447d7 100644
index d913298ea..b27447d7a 100644
--- a/src/main/java/org/bukkit/entity/LightningStrike.java
+++ b/src/main/java/org/bukkit/entity/LightningStrike.java
@@ -86,6 +86,16 @@ public interface LightningStrike extends Entity {
@ -66,5 +66,5 @@ index d913298e..b27447d7 100644
@NotNull
--
2.43.0
2.43.2

8
Bukkit-Patches/0009-Add-PlayerSpawnLocationEvent.patch
View file

@ -1,4 +1,4 @@
From ed28921780378dfab8de897fa293876161b2a7ec Mon Sep 17 00:00:00 2001
From e8b3cf4b284abd0154dba994f7447a6cc8043293 Mon Sep 17 00:00:00 2001
From: ninja <xninja@openmailbox.org>
Date: Tue, 8 Apr 2014 14:01:32 +0200
Subject: [PATCH] Add PlayerSpawnLocationEvent.
@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerSpawnLocationEvent.
diff --git a/src/main/java/org/spigotmc/event/player/PlayerSpawnLocationEvent.java b/src/main/java/org/spigotmc/event/player/PlayerSpawnLocationEvent.java
new file mode 100644
index 00000000..2515887c
index 000000000..2515887c2
--- /dev/null
+++ b/src/main/java/org/spigotmc/event/player/PlayerSpawnLocationEvent.java
@@ -0,0 +1,53 @@
@ -65,7 +65,7 @@ index 00000000..2515887c
+}
diff --git a/src/main/java/org/spigotmc/event/player/package-info.java b/src/main/java/org/spigotmc/event/player/package-info.java
new file mode 100644
index 00000000..6a2d5d84
index 000000000..6a2d5d84e
--- /dev/null
+++ b/src/main/java/org/spigotmc/event/player/package-info.java
@@ -0,0 +1,4 @@
@ -74,5 +74,5 @@ index 00000000..6a2d5d84
+ */
+package org.spigotmc.event.player;
--
2.43.0
2.43.2

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

@ -1,11 +1,11 @@
From c5679da77565994c87e64dd0696d49bde3a636f7 Mon Sep 17 00:00:00 2001
From 32a5c752bbe02fec97f20b02c13915a7da1331d6 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
diff --git a/pom.xml b/pom.xml
index e98ed55d..900855eb 100644
index 4d2bfb4ba..0861b4493 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,13 @@
@ -23,7 +23,7 @@ index e98ed55d..900855eb 100644
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
index 6149c77d..e3f185dc 100644
index 6149c77df..e3f185dc9 100644
--- a/src/main/java/org/bukkit/ChatColor.java
+++ b/src/main/java/org/bukkit/ChatColor.java
@@ -15,91 +15,223 @@ public enum ChatColor {
@ -285,10 +285,10 @@ index 6149c77d..e3f185dc 100644
* Gets the char value associated with this color
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 810f0420..e419d575 100644
index b20d1e8fb..f441ba2c2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1794,6 +1794,24 @@ public interface Server extends PluginMessageRecipient {
@@ -1810,6 +1810,24 @@ public interface Server extends PluginMessageRecipient {
public org.bukkit.configuration.file.YamlConfiguration getConfig() {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -314,7 +314,7 @@ index 810f0420..e419d575 100644
@NotNull
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
index 4b6b9540..284be63a 100644
index 4b6b95404..284be63a1 100644
--- a/src/main/java/org/bukkit/command/CommandSender.java
+++ b/src/main/java/org/bukkit/command/CommandSender.java
@@ -57,6 +57,43 @@ public interface CommandSender extends Permissible {
@ -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 8ad4d88c..a5046b41 100644
index c0583fd1b..764390e5b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2072,6 +2072,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2181,6 +2181,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public java.util.Set<Player> getHiddenPlayers() {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -425,7 +425,7 @@ index 8ad4d88c..a5046b41 100644
@NotNull
diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
index f740bebe..94852d50 100644
index f740bebee..94852d50e 100644
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
@@ -1,6 +1,7 @@
@ -508,5 +508,5 @@ index f740bebe..94852d50 100644
@NotNull
--
2.43.0
2.43.2

8
Bukkit-Patches/0011-Add-restart-API.patch
View file

@ -1,14 +1,14 @@
From cd46fa86aca2a569faeb5ca1da9becead709694d Mon Sep 17 00:00:00 2001
From 6e9e858a6a91218fa6f4da7588f91e9eae0ca82f Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 13 Jul 2015 19:10:15 +1000
Subject: [PATCH] Add restart API.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e419d575..c394954c 100644
index f441ba2c2..76b365f98 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1812,6 +1812,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1828,6 +1828,13 @@ public interface Server extends PluginMessageRecipient {
public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -23,5 +23,5 @@ index e419d575..c394954c 100644
@NotNull
--
2.43.0
2.43.2

10
CraftBukkit-Patches/0001-POM-Changes.patch
View file

@ -1,4 +1,4 @@
From b782b90f07ef5aaba1313901f1e7486f5cfc2867 Mon Sep 17 00:00:00 2001
From 6742389444efb17d5a6e16f9c2310964a289d7c6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 2 Jul 2013 13:07:39 +1000
Subject: [PATCH] POM Changes
@ -34,7 +34,7 @@ index ec61ec7570..b3da3373ac 100644
<!-- See http://checkstyle.sourceforge.net/config_imports.html -->
<module name="AvoidStarImport">
diff --git a/pom.xml b/pom.xml
index a9ffd7fa5e..266853a682 100644
index 44aba403a1..323892c4a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,20 @@
@ -72,7 +72,7 @@ index a9ffd7fa5e..266853a682 100644
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
@@ -290,11 +297,26 @@
@@ -296,11 +303,26 @@
<groupId>net.md-5</groupId>
<artifactId>scriptus</artifactId>
<version>0.5.0</version>
@ -102,7 +102,7 @@ index a9ffd7fa5e..266853a682 100644
<phase>initialize</phase>
<goals>
<goal>describe</goal>
@@ -327,7 +349,7 @@
@@ -333,7 +355,7 @@
<manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
<Implementation-Title>CraftBukkit</Implementation-Title>
@ -125,5 +125,5 @@ index f905d17b6b..93046379d0 100644
if (stream != null) {
--
2.43.0
2.43.2

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

@ -1,4 +1,4 @@
From 04be24fd1a3fa3afc34946a59f34305250afbb84 Mon Sep 17 00:00:00 2001
From d04fdbe5644b26513cd7a2f430bbbd10efaf84c5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 2 Jun 2013 15:10:56 +1000
Subject: [PATCH] Skeleton API Implementations
@ -6,10 +6,10 @@ Subject: [PATCH] Skeleton API Implementations
This contains the basic, empty implementations for some Spigot-API extensions. They are included early in the patching progress so that compilation will still succeed midway despite the APIs only being provided by subsequent patches.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9cb58095c4..e3c8fb366e 100644
index b0dad048fd..02b38d961d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2461,4 +2461,16 @@ public final class CraftServer implements Server {
@@ -2473,4 +2473,16 @@ public final class CraftServer implements Server {
public UnsafeValues getUnsafe() {
return CraftMagicNumbers.INSTANCE;
}
@ -27,10 +27,10 @@ index 9cb58095c4..e3c8fb366e 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 71b8fd19de..74fd305b20 100644
index fa92ac0523..90bb2728df 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1993,4 +1993,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2031,4 +2031,15 @@ public class CraftWorld extends CraftRegionAccessor implements World {
this.persistentDataContainer.putAll((NBTTagCompound) c);
}
}
@ -84,10 +84,10 @@ index be10d200e5..861739d4c4 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 5ad14d4a39..486c4a074b 100644
index d19210e115..56d4de675d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -865,4 +865,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -866,4 +866,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
return perm;
}
@ -124,10 +124,10 @@ index 3a4fb14bff..3a68e1cf5c 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 8c3f4c05d9..d163590287 100644
index 3cfd3a7fc2..6c825881e1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2178,4 +2178,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2246,4 +2246,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean isAllowingServerListings() {
return getHandle().allowsListing();
}
@ -144,10 +144,10 @@ index 8c3f4c05d9..d163590287 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
index d522ff8813..03b5764552 100644
index d4c47feb05..bfa9975988 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -347,6 +347,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -348,6 +348,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
if (this.pages != null) {
meta.pages = new ArrayList<String>(this.pages);
}
@ -155,7 +155,7 @@ index d522ff8813..03b5764552 100644
return meta;
}
@@ -419,4 +420,15 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -420,4 +421,15 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
return builder;
}
@ -172,5 +172,5 @@ index d522ff8813..03b5764552 100644
+ // Spigot end
}
--
2.43.0
2.43.2

12
CraftBukkit-Patches/0003-Spigot-Configuration.patch
View file

@ -1,4 +1,4 @@
From 6100a2c5ecba16110a36a921f533727512d99221 Mon Sep 17 00:00:00 2001
From 7b38d8758be623770ce0bc4e9e747e68019cf1d3 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 7 Jul 2013 09:32:53 +1000
Subject: [PATCH] Spigot Configuration
@ -6,7 +6,7 @@ Subject: [PATCH] Spigot Configuration
Provides the basic infrastructure to load and save the Spigot configuration file, spigot.yml
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index c7d70cbead..495e5b7d49 100644
index afffad76c1..08103f6469 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -178,6 +178,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -51,10 +51,10 @@ index aac03fbfe2..eabc5d5231 100644
this.world = new CraftWorld((WorldServer) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e3c8fb366e..ab361755a6 100644
index 02b38d961d..c62cd3904d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -895,6 +895,7 @@ public final class CraftServer implements Server {
@@ -907,6 +907,7 @@ public final class CraftServer implements Server {
logger.log(Level.WARNING, "Failed to load banned-players.json, " + ex.getMessage());
}
@ -62,7 +62,7 @@ index e3c8fb366e..ab361755a6 100644
for (WorldServer world : console.getAllLevels()) {
world.serverLevelData.setDifficulty(config.difficulty);
world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals);
@@ -909,11 +910,13 @@ public final class CraftServer implements Server {
@@ -921,11 +922,13 @@ public final class CraftServer implements Server {
}
}
}
@ -380,5 +380,5 @@ index 0000000000..1cce14866a
+ }
+}
--
2.43.0
2.43.2

16
CraftBukkit-Patches/0004-Crop-Growth-Rates.patch
View file

@ -1,4 +1,4 @@
From b026f796b5172608455d781ca46db380c6a1279d Mon Sep 17 00:00:00 2001
From 45bbebe40e686adbfb95caf22e212ba35aa6a8a6 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 7 Mar 2016 22:14:13 +1100
Subject: [PATCH] Crop Growth Rates
@ -55,7 +55,7 @@ index 671c10395e..6d4d73ecf6 100644
}
diff --git a/src/main/java/net/minecraft/world/level/block/BlockCactus.java b/src/main/java/net/minecraft/world/level/block/BlockCactus.java
index 2239b3660a..9b1b72c4cc 100644
index 196a65bc16..e848843498 100644
--- a/src/main/java/net/minecraft/world/level/block/BlockCactus.java
+++ b/src/main/java/net/minecraft/world/level/block/BlockCactus.java
@@ -65,13 +65,14 @@ public class BlockCactus extends Block {
@ -140,7 +140,7 @@ index 5dec1616e6..c33668b161 100644
if (this.canGrowInto(worldserver.getBlockState(blockposition1))) {
diff --git a/src/main/java/net/minecraft/world/level/block/BlockMushroom.java b/src/main/java/net/minecraft/world/level/block/BlockMushroom.java
index 50f5fb45bc..2949ea39f6 100644
index 8c609f6b93..466e817b8f 100644
--- a/src/main/java/net/minecraft/world/level/block/BlockMushroom.java
+++ b/src/main/java/net/minecraft/world/level/block/BlockMushroom.java
@@ -52,7 +52,7 @@ public class BlockMushroom extends BlockPlant implements IBlockFragilePlantEleme
@ -184,10 +184,10 @@ index 501798b582..afadf84429 100644
}
}
diff --git a/src/main/java/net/minecraft/world/level/block/BlockSapling.java b/src/main/java/net/minecraft/world/level/block/BlockSapling.java
index e669b36880..47edb9b4ea 100644
index cbd105b8c8..4f14e013f1 100644
--- a/src/main/java/net/minecraft/world/level/block/BlockSapling.java
+++ b/src/main/java/net/minecraft/world/level/block/BlockSapling.java
@@ -56,7 +56,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
@@ -57,7 +57,7 @@ public class BlockSapling extends BlockPlant implements IBlockFragilePlantElemen
@Override
public void randomTick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, RandomSource randomsource) {
@ -210,10 +210,10 @@ index a02e5d559a..359505bcd2 100644
if (i < 7) {
diff --git a/src/main/java/net/minecraft/world/level/block/BlockSweetBerryBush.java b/src/main/java/net/minecraft/world/level/block/BlockSweetBerryBush.java
index 4cfae55661..16c3541cc3 100644
index e906911a16..22da83dd37 100644
--- a/src/main/java/net/minecraft/world/level/block/BlockSweetBerryBush.java
+++ b/src/main/java/net/minecraft/world/level/block/BlockSweetBerryBush.java
@@ -74,7 +74,7 @@ public class BlockSweetBerryBush extends BlockPlant implements IBlockFragilePlan
@@ -73,7 +73,7 @@ public class BlockSweetBerryBush extends BlockPlant implements IBlockFragilePlan
public void randomTick(IBlockData iblockdata, WorldServer worldserver, BlockPosition blockposition, RandomSource randomsource) {
int i = (Integer) iblockdata.getValue(BlockSweetBerryBush.AGE);
@ -300,5 +300,5 @@ index 1cce14866a..f42972427b 100644
+ }
}
--
2.43.0
2.43.2

16
CraftBukkit-Patches/0005-Merge-tweaks-and-configuration.patch
View file

@ -1,4 +1,4 @@
From e698acaf27f53af1354285b23c821042ddf568b3 Mon Sep 17 00:00:00 2001
From 5d23753102bacc3921abf9ba0d64350f6bfc8db1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration
@ -6,10 +6,10 @@ Subject: [PATCH] Merge tweaks and configuration
This allows the merging of Experience orbs, as well as the configuration of the merge radius of items. Additionally it refactors the merge algorithm to be a better experience for players.
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 efb64b2fee..595b7d1c0c 100644
index 1be8c4aad4..fe176d374d 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
@@ -239,7 +239,10 @@ public class EntityItem extends Entity implements TraceableEntity {
@@ -240,7 +240,10 @@ public class EntityItem extends Entity implements TraceableEntity {
private void mergeWithNeighbours() {
if (this.isMergable()) {
@ -21,7 +21,7 @@ index efb64b2fee..595b7d1c0c 100644
return entityitem != this && entityitem.isMergable();
});
Iterator iterator = list.iterator();
@@ -269,7 +272,7 @@ public class EntityItem extends Entity implements TraceableEntity {
@@ -270,7 +273,7 @@ public class EntityItem extends Entity implements TraceableEntity {
ItemStack itemstack1 = entityitem.getItem();
if (Objects.equals(this.target, entityitem.target) && areMergable(itemstack, itemstack1)) {
@ -31,10 +31,10 @@ index efb64b2fee..595b7d1c0c 100644
} else {
merge(entityitem, itemstack1, this, itemstack);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index c2e73cc702..9c7fb8748e 100644
index c74cd39b7d..5f25af276c 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -706,6 +706,23 @@ public class CraftEventFactory {
@@ -707,6 +707,23 @@ public class CraftEventFactory {
return false;
}
@ -47,7 +47,7 @@ index c2e73cc702..9c7fb8748e 100644
+ if (e instanceof EntityExperienceOrb loopItem) {
+ if (!loopItem.isRemoved()) {
+ xp.value += loopItem.value;
+ loopItem.discard();
+ loopItem.discard(null); // Add Bukkit remove cause
+ }
+ }
+ }
@ -82,5 +82,5 @@ index f42972427b..5ff085b9e6 100644
+ }
}
--
2.43.0
2.43.2

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

@ -1,4 +1,4 @@
From 178bec0fa964a66c4c149af7d15df70ad4b1d87c Mon Sep 17 00:00:00 2001
From fdcb15437c77788bf3449c5df25eb883a25b4975 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
@ -6,7 +6,7 @@ Subject: [PATCH] Async Operation Catching
Catch and throw an exception when a potentially unsafe operation occurs on a thread other than the main server thread.
diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
index c4aeb5e583..6ef7fc63c7 100644
index b7e784c7da..5f7b9dff7a 100644
--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
@@ -1297,6 +1297,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -42,7 +42,7 @@ index c4aeb5e583..6ef7fc63c7 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 2cab851405..bf05fdcf93 100644
index a87c77016c..79bdd20421 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -1069,6 +1069,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -78,10 +78,10 @@ index 2cab851405..bf05fdcf93 100644
if (entity instanceof EntityPlayer) {
EntityPlayer entityplayer = (EntityPlayer) entity;
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index b7c22f2d9e..2657100257 100644
index cc5a02e062..df09a9d386 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -1101,6 +1101,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -1110,6 +1110,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
}
public boolean addEffect(MobEffect mobeffect, @Nullable Entity entity, EntityPotionEffectEvent.Cause cause) {
@ -122,10 +122,10 @@ index 6e42db3377..69212bdccc 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 ab361755a6..df332d0e04 100644
index c62cd3904d..09e034c309 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -850,6 +850,7 @@ public final class CraftServer implements Server {
@@ -862,6 +862,7 @@ public final class CraftServer implements Server {
public boolean dispatchCommand(CommandSender sender, String commandLine) {
Preconditions.checkArgument(sender != null, "sender cannot be null");
Preconditions.checkArgument(commandLine != null, "commandLine cannot be null");
@ -134,10 +134,10 @@ index ab361755a6..df332d0e04 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 74fd305b20..a67dcab6e0 100644
index 90bb2728df..d72e0a6cf4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -275,6 +275,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -282,6 +282,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean unloadChunkRequest(int x, int z) {
@ -145,7 +145,7 @@ index 74fd305b20..a67dcab6e0 100644
if (isChunkLoaded(x, z)) {
world.getChunkSource().removeRegionTicket(TicketType.PLUGIN, new ChunkCoordIntPair(x, z), 1, Unit.INSTANCE);
}
@@ -283,6 +284,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -290,6 +291,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
private boolean unloadChunk0(int x, int z, boolean save) {
@ -153,7 +153,7 @@ index 74fd305b20..a67dcab6e0 100644
if (!isChunkLoaded(x, z)) {
return true;
}
@@ -297,6 +299,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -304,6 +306,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean regenerateChunk(int x, int z) {
@ -161,7 +161,7 @@ index 74fd305b20..a67dcab6e0 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)) {
@@ -349,6 +352,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -356,6 +359,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public boolean loadChunk(int x, int z, boolean generate) {
@ -169,7 +169,7 @@ index 74fd305b20..a67dcab6e0 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.
@@ -848,6 +852,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -862,6 +866,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public Collection<Entity> getNearbyEntities(BoundingBox boundingBox, Predicate<? super Entity> filter) {
@ -177,7 +177,7 @@ index 74fd305b20..a67dcab6e0 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());
@@ -1002,6 +1007,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -1016,6 +1021,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@Override
public void save() {
@ -186,10 +186,10 @@ index 74fd305b20..a67dcab6e0 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 486c4a074b..ced47e0a65 100644
index 56d4de675d..a2d4fac745 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -226,6 +226,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -227,6 +227,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 486c4a074b..ced47e0a65 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 d163590287..8f43175278 100644
index 6c825881e1..ee3cc5826f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -390,6 +390,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -396,6 +396,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {
@ -257,5 +257,5 @@ index 0000000000..aeed769725
+ }
+}
--
2.43.0
2.43.2

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

@ -1,4 +1,4 @@
From 7fa75ffd8fa4e11e7367e19dc7c0a44d0dd8b4cb Mon Sep 17 00:00:00 2001
From 08946feb6bf9c632bc21bc8822735f0f925bfa5c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
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 bf05fdcf93..3031e0d27d 100644
index 79bdd20421..e9c287944e 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -281,8 +281,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -21,10 +21,10 @@ index bf05fdcf93..3031e0d27d 100644
Objects.requireNonNull(this.entityManager);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index e95e28c850..f120e47804 100644
index 0939dca866..3adacb7a7c 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -234,7 +234,8 @@ public abstract class PlayerList {
@@ -235,7 +235,8 @@ public abstract class PlayerList {
boolean flag1 = gamerules.getBoolean(GameRules.RULE_REDUCEDDEBUGINFO);
boolean flag2 = gamerules.getBoolean(GameRules.RULE_LIMITED_CRAFTING);
@ -34,7 +34,7 @@ index e95e28c850..f120e47804 100644
entityplayer.getBukkitEntity().sendSupportedChannels(); // CraftBukkit
playerconnection.send(new PacketPlayOutServerDifficulty(worlddata.getDifficulty(), worlddata.isDifficultyLocked()));
playerconnection.send(new PacketPlayOutAbilities(entityplayer.getAbilities()));
@@ -775,6 +776,8 @@ public abstract class PlayerList {
@@ -776,6 +777,8 @@ public abstract class PlayerList {
WorldData worlddata = worldserver2.getLevelData();
entityplayer1.connection.send(new PacketPlayOutRespawn(entityplayer1.createCommonSpawnInfo(worldserver2), (byte) i));
@ -85,5 +85,5 @@ index 5ff085b9e6..acaf903011 100644
+ }
}
--
2.43.0
2.43.2

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

@ -1,4 +1,4 @@
From e8045af9db6ba518db761f5c7a9e894f06de23c5 Mon Sep 17 00:00:00 2001
From 9ca63875e0613dfcd354d082f9aa89cfeea06ee1 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
@ -119,7 +119,7 @@ index 93f3119c18..bd32505366 100644
this.profiler.popPush("send chunks");
iterator = this.playerList.getPlayers().iterator();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 495e5b7d49..0a7e7af51c 100644
index 08103f6469..728b324142 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -59,6 +59,7 @@ import org.apache.logging.log4j.Level;
@ -198,7 +198,7 @@ index d4d9b5dd6d..e990a1b178 100644
}
}
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index 3031e0d27d..cdfa973454 100644
index e9c287944e..5dbdbb1111 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -173,6 +173,7 @@ import net.minecraft.world.level.storage.WorldDataServer;
@ -276,7 +276,7 @@ index 3031e0d27d..cdfa973454 100644
}
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index ee64c4546d..bd76f469a0 100644
index 6b29f1fd4a..546580e260 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -323,6 +323,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@ -321,7 +321,7 @@ index ee64c4546d..bd76f469a0 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 5f6680fdad..9999b8404a 100644
index 9d5622c769..91aba4956f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -137,6 +137,7 @@ import org.bukkit.craftbukkit.event.CraftPortalEvent;
@ -332,7 +332,7 @@ index 5f6680fdad..9999b8404a 100644
import org.bukkit.event.entity.EntityCombustByEntityEvent;
import org.bukkit.event.hanging.HangingBreakByEntityEvent;
import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
@@ -315,6 +316,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -316,6 +317,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
// Marks an entity, that it was removed by a plugin via Entity#remove
// Main use case currently is for SPIGOT-7487, preventing dropping of leash when leash is removed
public boolean pluginRemoved = false;
@ -340,7 +340,7 @@ index 5f6680fdad..9999b8404a 100644
public float getBukkitYaw() {
return this.yRot;
@@ -792,6 +794,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -804,6 +806,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
public void move(EnumMoveType enummovetype, Vec3D vec3d) {
@ -348,7 +348,7 @@ index 5f6680fdad..9999b8404a 100644
if (this.noPhysics) {
this.setPos(this.getX() + vec3d.x, this.getY() + vec3d.y, this.getZ() + vec3d.z);
} else {
@@ -952,6 +955,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -964,6 +967,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
this.level().getProfiler().pop();
}
}
@ -357,10 +357,10 @@ index 5f6680fdad..9999b8404a 100644
private boolean isStateClimbable(IBlockData iblockdata) {
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index 2657100257..fe8c2c8a29 100644
index df09a9d386..25a5f0f5f4 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -143,6 +143,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -145,6 +145,8 @@ import org.bukkit.event.entity.EntityTeleportEvent;
import org.bukkit.event.player.PlayerItemConsumeEvent;
// CraftBukkit end
@ -369,7 +369,7 @@ index 2657100257..fe8c2c8a29 100644
public abstract class EntityLiving extends Entity implements Attackable {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -2859,6 +2861,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -2880,6 +2882,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@Override
public void tick() {
@ -377,7 +377,7 @@ index 2657100257..fe8c2c8a29 100644
super.tick();
this.updatingUsingItem();
this.updateSwimAmount();
@@ -2900,7 +2903,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -2921,7 +2924,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
}
if (!this.isRemoved()) {
@ -387,7 +387,7 @@ index 2657100257..fe8c2c8a29 100644
}
double d0 = this.getX() - this.xo;
@@ -2984,6 +2989,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3005,6 +3010,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
}
this.refreshDirtyAttributes();
@ -395,7 +395,7 @@ index 2657100257..fe8c2c8a29 100644
}
public void detectEquipmentUpdatesPublic() { // CraftBukkit
@@ -3158,6 +3164,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3179,6 +3185,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.setDeltaMovement(d0, d1, d2);
this.level().getProfiler().push("ai");
@ -403,7 +403,7 @@ index 2657100257..fe8c2c8a29 100644
if (this.isImmobile()) {
this.jumping = false;
this.xxa = 0.0F;
@@ -3167,6 +3174,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3188,6 +3195,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.serverAiStep();
this.level().getProfiler().pop();
}
@ -411,7 +411,7 @@ index 2657100257..fe8c2c8a29 100644
this.level().getProfiler().pop();
this.level().getProfiler().push("jump");
@@ -3206,6 +3214,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3227,6 +3235,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.resetFallDistance();
}
@ -419,7 +419,7 @@ index 2657100257..fe8c2c8a29 100644
label104:
{
EntityLiving entityliving = this.getControllingPassenger();
@@ -3221,6 +3230,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3242,6 +3251,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.travel(vec3d1);
}
@ -427,7 +427,7 @@ index 2657100257..fe8c2c8a29 100644
this.level().getProfiler().pop();
this.level().getProfiler().push("freezing");
@@ -3247,7 +3257,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -3268,7 +3278,9 @@ public abstract class EntityLiving extends Entity implements Attackable {
this.checkAutoSpinAttack(axisalignedbb, this.getBoundingBox());
}
@ -559,7 +559,7 @@ index cb9b347b27..e36e39d993 100644
}
}
diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
index 570f628549..c66df1e7a9 100644
index 0482f20b77..f64a16d615 100644
--- a/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/world/level/chunk/storage/ChunkRegionLoader.java
@@ -483,10 +483,13 @@ public class ChunkRegionLoader {
@ -585,10 +585,10 @@ index 570f628549..c66df1e7a9 100644
};
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index df332d0e04..0a4ae1abef 100644
index 09e034c309..76d53232a1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2470,6 +2470,11 @@ public final class CraftServer implements Server {
@@ -2482,6 +2482,11 @@ public final class CraftServer implements Server {
private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
{
@ -824,5 +824,5 @@ index c885bc7443..70794669ff 100644
+ // Spigot end
}
--
2.43.0
2.43.2

6
CraftBukkit-Patches/0009-Fix-Mob-Spawning-Relative-to-View-Distance.patch
View file

@ -1,4 +1,4 @@
From a5514f1c19e3f1c7f58bdbe9281559df54fe0ad3 Mon Sep 17 00:00:00 2001
From bc85535d200c826c83080431bdf9c25a4c53716a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 21 Jun 2013 17:29:54 +1000
Subject: [PATCH] Fix Mob Spawning Relative to View Distance
@ -21,7 +21,7 @@ index e990a1b178..06cf1b8a59 100644
}
diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
index 6ef7fc63c7..8ab3b23b06 100644
index 5f7b9dff7a..631e43ab55 100644
--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
@@ -1105,6 +1105,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -93,5 +93,5 @@ index acaf903011..0c0c29efe5 100644
+ }
}
--
2.43.0
2.43.2

10
CraftBukkit-Patches/0010-Item-Despawn-Rate.patch
View file

@ -1,14 +1,14 @@
From e532e0cfff45be0d42dd5776b1097cce866ca88e Mon Sep 17 00:00:00 2001
From b3e19967bb3b7633c36ad6c34de0206f91493e1c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 22 Sep 2013 19:10:53 +1000
Subject: [PATCH] Item Despawn Rate
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 595b7d1c0c..0a7ceb6256 100644
index fe176d374d..ba1c164ece 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
@@ -207,7 +207,7 @@ public class EntityItem extends Entity implements TraceableEntity {
@@ -208,7 +208,7 @@ public class EntityItem extends Entity implements TraceableEntity {
}
}
@ -17,7 +17,7 @@ index 595b7d1c0c..0a7ceb6256 100644
// CraftBukkit start - fire ItemDespawnEvent
if (CraftEventFactory.callItemDespawnEvent(this).isCancelled()) {
this.age = 0;
@@ -537,7 +537,7 @@ public class EntityItem extends Entity implements TraceableEntity {
@@ -538,7 +538,7 @@ public class EntityItem extends Entity implements TraceableEntity {
public void makeFakeItem() {
this.setNeverPickUp();
@ -43,5 +43,5 @@ index 0c0c29efe5..e3682d28ca 100644
+ }
}
--
2.43.0
2.43.2

40
CraftBukkit-Patches/0011-Entity-Activation-Range.patch
View file

@ -1,4 +1,4 @@
From cd0c89689abe865ebbf8eb9c14f11a0443a391b6 Mon Sep 17 00:00:00 2001
From 6650128a97c309a396a6c436cc688d67d9360733 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 cdfa973454..a1b3b4911e 100644
index 5dbdbb1111..082eb6d5ba 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -427,6 +427,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -35,10 +35,10 @@ index cdfa973454..a1b3b4911e 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 9999b8404a..0016298d9a 100644
index 91aba4956f..36972362a4 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -317,6 +317,12 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -318,6 +318,12 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
// Main use case currently is for SPIGOT-7487, preventing dropping of leash when leash is removed
public boolean pluginRemoved = false;
public CustomTimingsHandler tickTimer = org.bukkit.craftbukkit.SpigotTimings.getEntityTimings(this); // Spigot
@ -51,7 +51,7 @@ index 9999b8404a..0016298d9a 100644
public float getBukkitYaw() {
return this.yRot;
@@ -354,6 +360,13 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -355,6 +361,13 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
this.position = Vec3D.ZERO;
this.blockPosition = BlockPosition.ZERO;
this.chunkPosition = ChunkCoordIntPair.ZERO;
@ -102,10 +102,10 @@ 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 05c0870d04..694e972195 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 {
@@ -170,6 +170,18 @@ public class EntityAreaEffectCloud extends Entity implements TraceableEntity {
this.duration = i;
}
@ -115,7 +115,7 @@ index 3d67ac66f6..c27be344f7 100644
+ super.inactiveTick();
+
+ if (this.tickCount >= this.waitTime + this.duration) {
+ this.discard();
+ this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+ return;
+ }
+ }
@ -125,10 +125,10 @@ 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 fe8c2c8a29..c95f1f58e5 100644
index 25a5f0f5f4..eb14219839 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -266,6 +266,13 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -268,6 +268,13 @@ public abstract class EntityLiving extends Entity implements Attackable {
return getYHeadRot();
}
// CraftBukkit end
@ -143,10 +143,10 @@ index fe8c2c8a29..c95f1f58e5 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 0a7ceb6256..969d304469 100644
index ba1c164ece..40c8152d36 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityItem.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityItem.java
@@ -220,6 +220,28 @@ public class EntityItem extends Entity implements TraceableEntity {
@@ -221,6 +221,28 @@ public class EntityItem extends Entity implements TraceableEntity {
}
}
@ -167,7 +167,7 @@ index 0a7ceb6256..969d304469 100644
+ return;
+ }
+ // CraftBukkit end
+ this.discard();
+ this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
+ }
+ }
+ // Spigot end
@ -176,10 +176,10 @@ index 0a7ceb6256..969d304469 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 49ae4e71bc..32bfae71eb 100644
index 3f5e5fc049..d14465a86d 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
@@ -225,6 +225,17 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
return this.assignProfessionWhenSpawned;
}
@ -198,10 +198,10 @@ index 49ae4e71bc..32bfae71eb 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 7fdb493b97..ef1b7e5bab 100644
index 5491c19a4e..70a2ca0283 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
@@ -77,6 +77,18 @@ public abstract class EntityArrow extends IProjectile {
@@ -78,6 +78,18 @@ public abstract class EntityArrow extends IProjectile {
private List<Entity> piercedAndKilledEntities;
public ItemStack pickupItemStack;
@ -221,10 +221,10 @@ index 7fdb493b97..ef1b7e5bab 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 3cf204efdf..885bbbe49b 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 {
@@ -82,6 +82,22 @@ public class EntityFireworks extends IProjectile implements ItemSupplier {
this.setOwner(entity);
}
@ -556,5 +556,5 @@ index e3682d28ca..936279b5fb 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0012-Metrics.patch
View file

@ -1,4 +1,4 @@
From a5af048b5d24cc6145e4efcc5ea61375b1703f86 Mon Sep 17 00:00:00 2001
From 3eaa3ddbf336e795d029a4fc8616664e40075da8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 23 Feb 2013 08:58:35 +1100
Subject: [PATCH] Metrics
@ -683,5 +683,5 @@ index 9ee0b4a1e7..7f14cbc63b 100644
static void readConfig(Class<?> clazz, Object instance)
--
2.43.0
2.43.2

6
CraftBukkit-Patches/0013-Entity-Tracking-Ranges.patch
View file

@ -1,4 +1,4 @@
From 3a7a8366d78b58f41a015c6924cb553fcb920a21 Mon Sep 17 00:00:00 2001
From 2c51ec251bfb74664f857e7f19ee3f85110e8e57 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Feb 2013 11:58:47 -0500
Subject: [PATCH] Entity Tracking Ranges
@ -12,7 +12,7 @@ This has multiple benefits:
4) Less client lag - Not trying to render distant item frames and paintings and entities will reduce entity count on the client, which is major for shop/town worlds which may use tons of item frames.
diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
index 8ab3b23b06..a415d36c53 100644
index 631e43ab55..80bd238581 100644
--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
@@ -1312,6 +1312,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -115,5 +115,5 @@ index 0000000000..7121ffcd8b
+ }
+}
--
2.43.0
2.43.2

30
CraftBukkit-Patches/0014-Hopper-Customisations.patch
View file

@ -1,4 +1,4 @@
From c81f9a1008a1f3b73bc4460eaf637b0ec78e862a Mon Sep 17 00:00:00 2001
From 9849df19342d81267981b6a5b4f2d53eb053d261 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 f2ccf0d254..3417dfa2f0 100644
index d826a3f69d..47a0425d11 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
@@ -143,9 +143,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -144,9 +144,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
tileentityhopper.tickedGameTime = world.getGameTime();
if (!tileentityhopper.isOnCooldown()) {
tileentityhopper.setCooldown(0);
@ -25,7 +25,7 @@ index f2ccf0d254..3417dfa2f0 100644
}
}
@@ -166,7 +171,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -167,7 +172,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
}
if (flag) {
@ -34,7 +34,7 @@ index f2ccf0d254..3417dfa2f0 100644
setChanged(world, blockposition, iblockdata);
return true;
}
@@ -209,7 +214,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -210,7 +215,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 f2ccf0d254..3417dfa2f0 100644
Inventory destinationInventory;
// Have to special case large chests as they work oddly
@@ -225,9 +230,10 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -226,9 +231,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 f2ccf0d254..3417dfa2f0 100644
ItemStack itemstack1 = addItem(iinventory, iinventory1, CraftItemStack.asNMSCopy(event.getItem()), enumdirection);
// CraftBukkit end
@@ -236,6 +242,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -237,6 +243,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
return true;
}
@ -63,7 +63,7 @@ index f2ccf0d254..3417dfa2f0 100644
iinventory.setItem(i, itemstack);
}
}
@@ -270,7 +277,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -271,7 +278,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 f2ccf0d254..3417dfa2f0 100644
});
} else {
Iterator iterator = getItemsAtAndAbove(world, ihopper).iterator();
@@ -289,14 +296,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -290,14 +297,14 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
}
}
@ -89,7 +89,7 @@ index f2ccf0d254..3417dfa2f0 100644
Inventory sourceInventory;
// Have to special case large chests as they work oddly
@@ -315,11 +322,12 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -316,11 +323,12 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
iinventory.setItem(i, itemstack1);
if (ihopper instanceof TileEntityHopper) {
@ -103,7 +103,7 @@ index f2ccf0d254..3417dfa2f0 100644
ItemStack itemstack2 = addItem(iinventory, ihopper, CraftItemStack.asNMSCopy(event.getItem()), null);
// CraftBukkit end
@@ -328,6 +336,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -329,6 +337,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
return true;
}
@ -111,7 +111,7 @@ index f2ccf0d254..3417dfa2f0 100644
iinventory.setItem(i, itemstack1);
}
@@ -431,6 +440,11 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -432,6 +441,11 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
boolean flag1 = iinventory1.isEmpty();
if (itemstack1.isEmpty()) {
@ -123,7 +123,7 @@ index f2ccf0d254..3417dfa2f0 100644
iinventory1.setItem(i, itemstack);
itemstack = ItemStack.EMPTY;
flag = true;
@@ -458,7 +472,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -459,7 +473,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
}
}
@ -132,7 +132,7 @@ index f2ccf0d254..3417dfa2f0 100644
}
}
@@ -520,6 +534,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper {
@@ -521,6 +535,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 = BlockPosition.containing(d0, d1, d2);
@ -168,5 +168,5 @@ index ab984b2109..cec948a055 100644
+ }
}
--
2.43.0
2.43.2

6
CraftBukkit-Patches/0015-Allow-Disabling-of-Command-Logging.patch
View file

@ -1,11 +1,11 @@
From 20726b53c9abf27f93c1b42a5a9d987fd4213ffc Mon Sep 17 00:00:00 2001
From 3a578bc00de585ac43b8965a5ebd670511215181 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index bd76f469a0..f787182eee 100644
index 546580e260..6ec4641943 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -1991,6 +1991,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@ -32,5 +32,5 @@ index 7f14cbc63b..bc9fbcc584 100644
+ }
}
--
2.43.0
2.43.2

8
CraftBukkit-Patches/0016-Allow-Disabling-of-Command-TabComplete.patch
View file

@ -1,4 +1,4 @@
From eac95ca3d8c5292aef605d31d33fa749a0c45c1d Mon Sep 17 00:00:00 2001
From f51cc6fda40dfd610aa539cb4aad663ac8515f72 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
@ -25,10 +25,10 @@ index 52f9c46b34..034d4b7592 100644
if (commandnode2.canUse(commandlistenerwrapper)) {
ArgumentBuilder argumentbuilder = commandnode2.createBuilder(); // CraftBukkit - decompile error
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0a4ae1abef..51e019e28a 100644
index 76d53232a1..c07661cc38 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2115,6 +2115,13 @@ public final class CraftServer implements Server {
@@ -2127,6 +2127,13 @@ public final class CraftServer implements Server {
}
public List<String> tabCompleteCommand(Player player, String message, WorldServer world, Vec3D pos) {
@ -71,5 +71,5 @@ index bc9fbcc584..fc352ecf10 100644
+ }
}
--
2.43.0
2.43.2

14
CraftBukkit-Patches/0017-Configurable-Messages.patch
View file

@ -1,4 +1,4 @@
From 9779a7fcc2118f8d3e1daba7226f7a6bbce6b98a Mon Sep 17 00:00:00 2001
From 4ac4898d46e62532e6f1edf92e1049f586992c2a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
@ -23,10 +23,10 @@ index e9ec3fd8c5..18b350f024 100644
this.connection.send(new PacketLoginOutDisconnect(ichatmutablecomponent));
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index f120e47804..7a5665303c 100644
index 3adacb7a7c..6f4b50b220 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -597,7 +597,7 @@ public abstract class PlayerList {
@@ -598,7 +598,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, CraftChatMessage.fromComponent(ichatmutablecomponent));
} else if (!this.isWhiteListed(gameprofile)) {
ichatmutablecomponent = IChatBaseComponent.translatable("multiplayer.disconnect.not_whitelisted");
@ -35,7 +35,7 @@ index f120e47804..7a5665303c 100644
} else if (getIpBans().isBanned(socketaddress) && !getIpBans().get(socketaddress).hasExpired()) {
IpBanEntry ipbanentry = this.ipBans.get(socketaddress);
@@ -611,7 +611,7 @@ public abstract class PlayerList {
@@ -612,7 +612,7 @@ public abstract class PlayerList {
} else {
// return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? IChatBaseComponent.translatable("multiplayer.disconnect.server_full") : null;
if (this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile)) {
@ -45,10 +45,10 @@ index f120e47804..7a5665303c 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 51e019e28a..b9801ba2ed 100644
index c07661cc38..7d2b0c3655 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -856,11 +856,11 @@ public final class CraftServer implements Server {
@@ -868,11 +868,11 @@ public final class CraftServer implements Server {
return true;
}
@ -106,5 +106,5 @@ index fc352ecf10..8ad8b25894 100644
+ }
}
--
2.43.0
2.43.2

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

@ -1,4 +1,4 @@
From 20d0392ccd6d18760684b9f730cfbd4ef547c2cb Mon Sep 17 00:00:00 2001
From 91bf786649c4480f0169e5a9378d8e021efe24f8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
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 a1b3b4911e..c2dc160021 100644
index 082eb6d5ba..8624d54438 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -1123,6 +1123,15 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -40,5 +40,5 @@ index a1b3b4911e..c2dc160021 100644
if (entity instanceof EntityPlayer) {
EntityPlayer entityplayer = (EntityPlayer) entity;
--
2.43.0
2.43.2

6
CraftBukkit-Patches/0019-Disallow-Interaction-With-Self.patch
View file

@ -1,11 +1,11 @@
From 7a79d71458218f1ce3823a8aa78347962d7ff66b Mon Sep 17 00:00:00 2001
From 443a638acf39ebbab44d1481c30ca52d42136127 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 28 Jun 2013 19:52:54 +1000
Subject: [PATCH] Disallow Interaction With Self
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index f787182eee..03f285a956 100644
index 6ec4641943..b2c16cb5a8 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -2245,6 +2245,13 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@ -23,5 +23,5 @@ index f787182eee..03f285a956 100644
this.player.resetLastActionTime();
this.player.setShiftKeyDown(packetplayinuseentity.isUsingSecondaryAction());
--
2.43.0
2.43.2

8
CraftBukkit-Patches/0020-Prevent-Ghost-Players-Caused-by-Plugins.patch
View file

@ -1,4 +1,4 @@
From a441e6dffdd3953064af0d201f687511848dbcc2 Mon Sep 17 00:00:00 2001
From e05cc2a682cd4533da098770957a01c37a20bfcb Mon Sep 17 00:00:00 2001
From: Alex Ciuba <alexciuba@gmail.com>
Date: Tue, 11 Jun 2013 15:23:03 -0400
Subject: [PATCH] Prevent Ghost Players Caused by Plugins
@ -6,10 +6,10 @@ Subject: [PATCH] Prevent Ghost Players Caused by Plugins
Check if the player is still connected after firing event. Fixes BUKKIT-4327
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 7a5665303c..92815d055f 100644
index 6f4b50b220..f7c7bb35fe 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -754,6 +754,11 @@ public abstract class PlayerList {
@@ -755,6 +755,11 @@ public abstract class PlayerList {
Player respawnPlayer = entityplayer1.getBukkitEntity();
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !flag2, flag2, reason);
cserver.getPluginManager().callEvent(respawnEvent);
@ -22,5 +22,5 @@ index 7a5665303c..92815d055f 100644
location = respawnEvent.getRespawnLocation();
if (!flag) entityplayer.reset(); // SPIGOT-4785
--
2.43.0
2.43.2

8
CraftBukkit-Patches/0021-Implement-respawn-API.patch
View file

@ -1,14 +1,14 @@
From a3a663224b446cc225e222dd2f7760792fdee915 Mon Sep 17 00:00:00 2001
From 956ae8b0e64f80ce36382fb98507b28d1c9f78b2 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 8f43175278..31fe6e00ea 100644
index ee3cc5826f..cc74be0e1f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2183,6 +2183,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2251,6 +2251,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{
@ -25,5 +25,5 @@ index 8f43175278..31fe6e00ea 100644
public Player.Spigot spigot()
--
2.43.0
2.43.2

10
CraftBukkit-Patches/0022-Arrow-Despawn-Rate.patch
View file

@ -1,20 +1,20 @@
From e30d7f0477611b31587c2f3fb45d8c22a13dfa74 Mon Sep 17 00:00:00 2001
From bd8795e7ecc15293d6aab15f8c422c0e69afe313 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 14 Oct 2013 19:20:10 +1100
Subject: [PATCH] Arrow Despawn Rate
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 ef1b7e5bab..7d10b6fb70 100644
index 70a2ca0283..e6dea10c7f 100644
--- a/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
+++ b/src/main/java/net/minecraft/world/entity/projectile/EntityArrow.java
@@ -321,7 +321,7 @@ public abstract class EntityArrow extends IProjectile {
@@ -322,7 +322,7 @@ public abstract class EntityArrow extends IProjectile {
protected void tickDespawn() {
++this.life;
- if (this.life >= 1200) {
+ if (this.life >= ((this instanceof EntityThrownTrident) ? this.level().spigotConfig.tridentDespawnRate : this.level().spigotConfig.arrowDespawnRate)) { // Spigot
this.discard();
this.discard(EntityRemoveEvent.Cause.DESPAWN); // CraftBukkit - add Bukkit remove cause
}
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@ -36,5 +36,5 @@ index cec948a055..4894096ae1 100644
+ }
}
--
2.43.0
2.43.2

12
CraftBukkit-Patches/0023-Watchdog-Thread.patch
View file

@ -1,4 +1,4 @@
From a47102a46acc5365cc334c9373497f816f23cef7 Mon Sep 17 00:00:00 2001
From b65477d766615f3b786b1c574cc69589d7626c67 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 5 Aug 2014 17:20:19 +0100
Subject: [PATCH] Watchdog Thread.
@ -25,7 +25,7 @@ index bd32505366..303d3b3b14 100644
org.spigotmc.CustomTimingsHandler.tick(); // Spigot
}
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 0a7e7af51c..8e54082c5f 100644
index 728b324142..4c36e63e1c 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -259,7 +259,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -38,10 +38,10 @@ index 0a7e7af51c..8e54082c5f 100644
thread1.setUncaughtExceptionHandler(new ThreadNamedUncaughtExceptionHandler(DedicatedServer.LOGGER));
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b9801ba2ed..8c8a4cd740 100644
index 7d2b0c3655..620ef31298 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2077,7 +2077,7 @@ public final class CraftServer implements Server {
@@ -2089,7 +2089,7 @@ public final class CraftServer implements Server {
@Override
public boolean isPrimaryThread() {
@ -50,7 +50,7 @@ index b9801ba2ed..8c8a4cd740 100644
}
@Override
@@ -2482,6 +2482,11 @@ public final class CraftServer implements Server {
@@ -2494,6 +2494,11 @@ public final class CraftServer implements Server {
{
return org.spigotmc.SpigotConfig.config;
}
@ -359,5 +359,5 @@ index 0000000000..4734d4ae83
+ }
+}
--
2.43.0
2.43.2

22
CraftBukkit-Patches/0024-BungeeCord-Support.patch
View file

@ -1,4 +1,4 @@
From b2bb8ee1dd3c7fc9197cef3ca1d197ea5c60f9e3 Mon Sep 17 00:00:00 2001
From 9fe023cfabdcab6e93b83671c0a4b6f685959c1a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 12 Apr 2014 21:23:58 +1000
Subject: [PATCH] BungeeCord Support
@ -36,7 +36,7 @@ index 78a7dc329d..c3347013f2 100644
@Override
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 8e54082c5f..df923b7a10 100644
index 4c36e63e1c..7ce35b37be 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -223,7 +223,14 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@ -168,7 +168,7 @@ index 21e7d5db02..631dd2003b 100644
HELLO, KEY, AUTHENTICATING, NEGOTIATING, VERIFYING, WAITING_FOR_DUPE_DISCONNECT, PROTOCOL_SWITCHING, ACCEPTED;
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 03f285a956..876cb0d9f0 100644
index b2c16cb5a8..4927391a34 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -1935,7 +1935,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@ -217,10 +217,10 @@ index 3bf6d7d2d4..8e95956397 100644
} else {
String[] astring1 = astring;
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 92815d055f..47b472af44 100644
index f7c7bb35fe..a5982632a7 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -583,7 +583,7 @@ public abstract class PlayerList {
@@ -584,7 +584,7 @@ public abstract class PlayerList {
EntityPlayer entity = new EntityPlayer(this.server, this.server.getLevel(World.OVERWORLD), gameprofile, ClientInformation.createDefault());
Player player = entity.getBukkitEntity();
@ -230,10 +230,10 @@ index 92815d055f..47b472af44 100644
if (getBans().isBanned(gameprofile) && !getBans().get(gameprofile).hasExpired()) {
GameProfileBanEntry gameprofilebanentry = (GameProfileBanEntry) this.bans.get(gameprofile);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8c8a4cd740..515943e9b5 100644
index 620ef31298..190c3d671d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -755,7 +755,13 @@ public final class CraftServer implements Server {
@@ -767,7 +767,13 @@ public final class CraftServer implements Server {
@Override
public long getConnectionThrottle() {
@ -248,7 +248,7 @@ index 8c8a4cd740..515943e9b5 100644
}
@Override
@@ -1752,7 +1758,7 @@ public final class CraftServer implements Server {
@@ -1764,7 +1770,7 @@ public final class CraftServer implements Server {
if (result == null) {
GameProfile profile = null;
// Only fetch an online UUID in online mode
@ -258,10 +258,10 @@ index 8c8a4cd740..515943e9b5 100644
profile = console.getProfileCache().get(name).orElse(null);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 31fe6e00ea..49fbd7e015 100644
index cc74be0e1f..6328bf9355 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2184,6 +2184,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2252,6 +2252,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private final Player.Spigot spigot = new Player.Spigot()
{
@ -294,5 +294,5 @@ index 130016282a..1e6b13103a 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0025-Allow-Disabling-Zombie-Villager-Aggression.patch
View file

@ -1,4 +1,4 @@
From 91272f5ee70e9a5c45fa094966f4b7cc6a9a3039 Mon Sep 17 00:00:00 2001
From 45286024a70786b7634a198f36731ae99cf2bd73 Mon Sep 17 00:00:00 2001
From: Dylan Xaldin <Puremin0rez515@gmail.com>
Date: Thu, 12 Dec 2013 18:05:03 -0600
Subject: [PATCH] Allow Disabling Zombie Villager Aggression
@ -35,5 +35,5 @@ index 4894096ae1..457a8e84b0 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0026-Configurable-Amount-of-Netty-Threads.patch
View file

@ -1,4 +1,4 @@
From a4894494c1f290cba94a1d5e8051096f92197712 Mon Sep 17 00:00:00 2001
From bbc6bf4298e0f8948bd92fca5b5ee0f6ea5ace23 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:58:58 +1100
Subject: [PATCH] Configurable Amount of Netty Threads
@ -44,5 +44,5 @@ index 1e6b13103a..8091770655 100644
+ }
}
--
2.43.0
2.43.2

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

@ -1,14 +1,14 @@
From c12f2c627dd41b0a0a27c0ed5739925e3a2dedea Mon Sep 17 00:00:00 2001
From 6e85479109a354266144de3fade54958e2381256 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 0016298d9a..6f0498a455 100644
index 36972362a4..7ff06ffff7 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -1969,6 +1969,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -1981,6 +1981,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
if (maxAirTicks != getDefaultMaxAirSupply()) {
nbttagcompound.putInt("Bukkit.MaxAirSupply", getMaxAirSupply());
}
@ -16,7 +16,7 @@ index 0016298d9a..6f0498a455 100644
// CraftBukkit end
IChatBaseComponent ichatbasecomponent = this.getCustomName();
@@ -2127,6 +2128,11 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -2139,6 +2140,11 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
}
// CraftBukkit start
@ -29,5 +29,5 @@ index 0016298d9a..6f0498a455 100644
this.visibleByDefault = !nbttagcompound.contains("Bukkit.visibleByDefault") || nbttagcompound.getBoolean("Bukkit.visibleByDefault");
// SPIGOT-6907: re-implement LivingEntity#setMaximumAir()
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0028-Add-Option-to-Nerf-Mobs-from-Spawners.patch
View file

@ -1,4 +1,4 @@
From 8b0577e42a67420e77e82174fdc8df6f94ece1f9 Mon Sep 17 00:00:00 2001
From 3015a21cd55de2c1e783de7541f66c18fbf62057 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 2 Feb 2014 16:55:46 +0000
Subject: [PATCH] Add Option to Nerf Mobs from Spawners
@ -38,5 +38,5 @@ index 457a8e84b0..3e398c4e06 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0029-Allow-statistics-to-be-disabled-forced.patch
View file

@ -1,4 +1,4 @@
From e6661833577bbfae7095ee97cb58858206cdc574 Mon Sep 17 00:00:00 2001
From 6b33908006d1e0d9276136e8c0282a8a1d232d47 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 7 Jan 2014 15:56:26 +0000
Subject: [PATCH] Allow statistics to be disabled/forced
@ -94,5 +94,5 @@ index 8091770655..c81333c505 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0030-Catch-stalling-on-corrupted-map-data-NBT-arrays.patch
View file

@ -1,4 +1,4 @@
From bebdd63fa7be4e0c7e243e94fce226c7aee5da2b Mon Sep 17 00:00:00 2001
From 91d9ed6319ec1cd487686454c2e8e3622396be16 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 20 Jan 2014 13:44:07 +1100
Subject: [PATCH] Catch stalling on corrupted map data / NBT arrays.
@ -29,5 +29,5 @@ index 7e4c021ca7..96d4721c66 100644
nbtreadlimiter.accountBytes(4L, (long) i);
int[] aint = new int[i];
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0031-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
View file

@ -1,4 +1,4 @@
From 9b60aeae341ba363283ba68a35abdf6ee81cf154 Mon Sep 17 00:00:00 2001
From 2758f2c916169f876b876c1913d358a79442048e Mon Sep 17 00:00:00 2001
From: Dmck2b <dmck2b+github@gmail.com>
Date: Mon, 20 Jan 2014 20:18:23 +0000
Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks
@ -34,5 +34,5 @@ index 3e398c4e06..d4eb3ccdab 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0032-Highly-Optimized-Tick-Loop.patch
View file

@ -1,4 +1,4 @@
From 957e53adef4fc2a57275ee94015d4ddebc3c5406 Mon Sep 17 00:00:00 2001
From 13012ebbe1c66fd1aacb226407e2841b950c7e87 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 26 Jan 2017 21:50:51 +0000
Subject: [PATCH] Highly Optimized Tick Loop
@ -129,5 +129,5 @@ index 0000000000..f5b6dec1cb
+ }
+}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0033-Configurable-Ping-Sample-Size.patch
View file

@ -1,4 +1,4 @@
From c9ddbfb8a2e6ac4ed2ddfaa053035c85783183fd Mon Sep 17 00:00:00 2001
From cbb172db73e1680cfc6a79db358f34e71b664079 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 26 Jan 2014 21:48:34 +1100
Subject: [PATCH] Configurable Ping Sample Size
@ -39,5 +39,5 @@ index 593cab3bdd..06cb5eb3c7 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0034-Add-Optional-Tick-Shuffling.patch
View file

@ -1,4 +1,4 @@
From f9ef6a078e854ac8db6e0b37695736376032d1ef Mon Sep 17 00:00:00 2001
From 9329f59633a5aacc7cb64b12b7b1fc82595fcc40 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 27 Jan 2014 08:39:26 +1100
Subject: [PATCH] Add Optional Tick Shuffling
@ -39,5 +39,5 @@ index 06cb5eb3c7..b28d0e91cb 100644
+ }
}
--
2.43.0
2.43.2

6
CraftBukkit-Patches/0035-Spam-Filter-Exclusions.patch
View file

@ -1,11 +1,11 @@
From 6d63cd0f77b1bac61b16d4ee1c0c9323a6c61ef2 Mon Sep 17 00:00:00 2001
From b6bc35a9cea76166a6a06e69574aff8b3d6fe4b5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 876cb0d9f0..a37d13c61a 100644
index 4927391a34..247b23dc17 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -1795,7 +1795,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@ -69,5 +69,5 @@ index b28d0e91cb..c612c321d9 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0036-Add-Option-to-Silence-CommandBlock-Console.patch
View file

@ -1,4 +1,4 @@
From 88faa83240e62f9a6e79127a324e00f6e0bae64f Mon Sep 17 00:00:00 2001
From 2001e171f5029b88a2a5b8bfbdf1882587c833e8 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 9 Feb 2014 14:39:01 +1100
Subject: [PATCH] Add Option to Silence CommandBlock Console
@ -33,5 +33,5 @@ index c612c321d9..5d2c3a6b88 100644
+ }
}
--
2.43.0
2.43.2

8
CraftBukkit-Patches/0037-Add-support-for-fetching-hidden-players.patch
View file

@ -1,14 +1,14 @@
From b9d739efc74c09d83d3dd02ea0d4c059f7cb5a1a Mon Sep 17 00:00:00 2001
From 4cbc992d9f8f6c61c7a7d24c821f7d9ae7d4cae4 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 49fbd7e015..53405191f6 100644
index 6328bf9355..8c5cefbf65 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2198,6 +2198,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2266,6 +2266,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().respawn( getHandle(), false, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.PLUGIN );
}
}
@ -31,5 +31,5 @@ index 49fbd7e015..53405191f6 100644
public Player.Spigot spigot()
--
2.43.0
2.43.2

10
CraftBukkit-Patches/0038-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
View file

@ -1,14 +1,14 @@
From cd493b14655eaa7df6c4c72d99ef7729b24bc682 Mon Sep 17 00:00:00 2001
From 8ab7261626db2be0df7b374d2ea5e0e8141cf6c3 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 12 Feb 2014 20:44:14 +0000
Subject: [PATCH] Allow vanilla commands to be the main version of a command
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 515943e9b5..57483ca5c2 100644
index 190c3d671d..59e58112c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -453,8 +453,11 @@ public final class CraftServer implements Server {
@@ -455,8 +455,11 @@ public final class CraftServer implements Server {
}
if (type == PluginLoadOrder.POSTWORLD) {
@ -21,7 +21,7 @@ index 515943e9b5..57483ca5c2 100644
commandMap.registerServerAliases();
DefaultPermissions.registerCorePermissions();
CraftDefaultPermissions.registerCorePermissions();
@@ -468,12 +471,21 @@ public final class CraftServer implements Server {
@@ -470,12 +473,21 @@ public final class CraftServer implements Server {
pluginManager.disablePlugins();
}
@ -78,5 +78,5 @@ index 5d2c3a6b88..ba66d92906 100644
+ }
}
--
2.43.0
2.43.2

8
CraftBukkit-Patches/0039-Implement-Silenceable-Lightning-API.patch
View file

@ -1,14 +1,14 @@
From 733711eea01b4287a7fff6f57f0e24d17bb8216d Mon Sep 17 00:00:00 2001
From 5f726c7924e7fd467637093faeee18aa60211c30 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
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a67dcab6e0..907895f6c2 100644
index d72e0a6cf4..50a2e92cce 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -2003,6 +2003,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -2041,6 +2041,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
// Spigot start
private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
{
@ -44,5 +44,5 @@ index 3a68e1cf5c..6c44dfa1cb 100644
@Override
--
2.43.0
2.43.2

12
CraftBukkit-Patches/0040-Configurable-dragon-death-and-wither-spawn-sounds.patch
View file

@ -1,14 +1,14 @@
From a0a3f4cabbf582b51233b0d46b9401e7f79965ea Mon Sep 17 00:00:00 2001
From d32ccdbf97524eaa70b29cb00b763a5c56b939cc Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Sat, 29 Mar 2014 13:44:25 -0400
Subject: [PATCH] Configurable dragon death and wither spawn sounds
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
index 99eb6571c4..a1b92ebe91 100644
index 49b3e9c489..15d9dd384e 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.java
@@ -678,7 +678,24 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -679,7 +679,24 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
}
if (this.dragonDeathTime == 1 && !this.isSilent()) {
@ -35,10 +35,10 @@ index 99eb6571c4..a1b92ebe91 100644
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
index ec06bde715..18eeb9e4f3 100644
index 66cf056e6f..0f56303aef 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/EntityWither.java
@@ -277,6 +277,7 @@ public class EntityWither extends EntityMonster implements PowerableMob, IRanged
@@ -278,6 +278,7 @@ public class EntityWither extends EntityMonster implements PowerableMob, IRanged
double deltaX = this.getX() - player.getX();
double deltaZ = this.getZ() - player.getZ();
double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
@ -105,5 +105,5 @@ index d4eb3ccdab..7f5f97defc 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0041-Display-Spigot-in-client-crashes-server-lists-and-Mo.patch
View file

@ -1,4 +1,4 @@
From 88c5beee6cf4187c1929d8807136bed3d3273122 Mon Sep 17 00:00:00 2001
From 555b10adb4132a8f49260855b18fca48dc97a01e Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Fri, 11 Apr 2014 11:16:34 +0100
Subject: [PATCH] Display 'Spigot' in client crashes, server lists and Mojang
@ -19,5 +19,5 @@ index 6d3111a6a2..f61c9ce7c1 100644
public SystemReport fillSystemReport(SystemReport systemreport) {
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0042-Print-Stack-on-InternalException.patch
View file

@ -1,4 +1,4 @@
From 0d90202ec8752e0f248b1d50a831029dad77a2b4 Mon Sep 17 00:00:00 2001
From c8fabf761a64a462813d98a9fb54e35a9c1a9f94 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 13 Apr 2014 09:00:59 +1000
Subject: [PATCH] Print Stack on InternalException
@ -17,5 +17,5 @@ index 2c4e85749a..7a083a9961 100644
protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet<?> packet) {
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0043-Use-Offline-Player-Data-Once-if-Required.patch
View file

@ -1,4 +1,4 @@
From 1b16ac6bbd18d8193a16efbdf9bf3023afd3bd05 Mon Sep 17 00:00:00 2001
From e33b15c0fb0fef552e0eccfdaa57c975a62ae265 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 13 Apr 2014 14:41:23 +1000
Subject: [PATCH] Use Offline Player Data Once if Required.
@ -39,5 +39,5 @@ index 689d28b5b9..d77142665d 100644
WorldNBTStorage.LOGGER.warn("Failed to load player data for {}", entityhuman.getName().getString());
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0044-Fix-Player-Banning.patch
View file

@ -1,4 +1,4 @@
From 7f8943fa0ad3d1f2385fbdccbc24f9b2fc3e3a2a Mon Sep 17 00:00:00 2001
From c793b2430242956e4231a6cdd497bb25f996a9f1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 15 Apr 2014 10:32:48 +1000
Subject: [PATCH] Fix Player Banning
@ -45,5 +45,5 @@ index 2fd5a1c5f1..cc66113e96 100644
}
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0045-Prevent-NoClassDefError-crash-and-notify-on-crash.patch
View file

@ -1,4 +1,4 @@
From f1bae9bbf7f0cdc13e5091b0185922d89ccc4132 Mon Sep 17 00:00:00 2001
From bd3679644e3d31a389686b165d39030359bdb04c Mon Sep 17 00:00:00 2001
From: David <dmck2b@gmail.com>
Date: Mon, 21 Apr 2014 12:43:08 +0100
Subject: [PATCH] Prevent NoClassDefError crash and notify on crash
@ -65,5 +65,5 @@ index 4734d4ae83..b4eeeb0d00 100644
log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Spigot!):" );
dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0046-Fix-race-condition-that-could-kill-connections-befor.patch
View file

@ -1,4 +1,4 @@
From 1c871bf2920f3e6c984cac95c0bcbd9752898ed4 Mon Sep 17 00:00:00 2001
From 386e896cd8aa9f3f45720cc47bbb6c10076ff4c6 Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Fri, 25 Apr 2014 23:46:46 +0200
Subject: [PATCH] Fix race condition that could kill connections before they
@ -59,5 +59,5 @@ index 4773f886da..b1676b4a73 100644
networkmanager.handleDisconnection();
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0047-Configurable-UserCache-cap.patch
View file

@ -1,4 +1,4 @@
From 5f38fbd456e8ce6f0c102f790151b0c22b73a0fb Mon Sep 17 00:00:00 2001
From c22ed290740a2172c2873bba3e8d1476dc0e76b9 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Fri, 25 Apr 2014 18:17:30 -0400
Subject: [PATCH] Configurable UserCache cap
@ -33,5 +33,5 @@ index ba66d92906..6c68dc749c 100644
+ }
}
--
2.43.0
2.43.2

8
CraftBukkit-Patches/0048-Implement-PlayerSpawnLocationEvent.patch
View file

@ -1,14 +1,14 @@
From 1eed7256f8dcb26f279021adeab4733b29e802dc Mon Sep 17 00:00:00 2001
From 286d617188bb31799c6612622573e102ef95e90c Mon Sep 17 00:00:00 2001
From: ninja <xninja@openmailbox.org>
Date: Tue, 8 Apr 2014 14:05:19 +0200
Subject: [PATCH] Implement PlayerSpawnLocationEvent.
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 47b472af44..882d3986f8 100644
index a5982632a7..0e4ba589c9 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -223,6 +223,19 @@ public abstract class PlayerList {
@@ -224,6 +224,19 @@ public abstract class PlayerList {
entityplayer.setServerLevel(worldserver1);
String s1 = networkmanager.getLoggableAddress(this.server.logIPs());
@ -29,5 +29,5 @@ index 47b472af44..882d3986f8 100644
// PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ({}, {}, {})", new Object[]{entityplayer.getName().getString(), s1, entityplayer.getId(), entityplayer.getX(), entityplayer.getY(), entityplayer.getZ()});
WorldData worlddata = worldserver1.getLevelData();
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0049-Configurable-save-on-stop-only-for-UserCache.patch
View file

@ -1,4 +1,4 @@
From 044886ed6f86e4e75a1b9c98f8e38924cc039a24 Mon Sep 17 00:00:00 2001
From 74900857bb4ee608e0a53a1fd30f822ab885f55a Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Fri, 23 May 2014 18:05:10 -0400
Subject: [PATCH] Configurable save-on-stop-only for UserCache
@ -59,5 +59,5 @@ index 6c68dc749c..dcb5270691 100644
+ }
}
--
2.43.0
2.43.2

6
CraftBukkit-Patches/0050-Limit-block-placement-interaction-packets.patch
View file

@ -1,4 +1,4 @@
From c91933f0a817933c155ad8cf808409e3c442f4bc Mon Sep 17 00:00:00 2001
From 00420ea5d8670a002d18091ffff46b85028f9351 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sun, 29 Jun 2014 21:10:34 +0100
Subject: [PATCH] Limit block placement/interaction packets
@ -45,7 +45,7 @@ index 675909dc64..44ed8f10d4 100644
this.blockHit = packetdataserializer.readBlockHitResult();
this.sequence = packetdataserializer.readVarInt();
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index a37d13c61a..b886a48c6f 100644
index 247b23dc17..24137a61fc 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -1529,10 +1529,30 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@ -88,5 +88,5 @@ index a37d13c61a..b886a48c6f 100644
WorldServer worldserver = this.player.serverLevel();
EnumHand enumhand = packetplayinblockplace.getHand();
--
2.43.0
2.43.2

14
CraftBukkit-Patches/0051-Better-item-validation.patch
View file

@ -1,4 +1,4 @@
From 02fc0bf9c7ebb8c72dcd21ae97cbbdc75acb651f Mon Sep 17 00:00:00 2001
From a3b245935253672c48690122c3a814e7d1b5a15f Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Wed, 2 Jul 2014 23:35:51 +0100
Subject: [PATCH] Better item validation
@ -20,10 +20,10 @@ index d5d5b75b36..138bf59b43 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
index 03b5764552..dfde2c619c 100644
index bfa9975988..391ed14231 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -20,6 +20,10 @@ import org.bukkit.craftbukkit.util.CraftChatMessage;
@@ -21,6 +21,10 @@ import org.bukkit.craftbukkit.util.CraftChatMessage;
import org.bukkit.craftbukkit.util.CraftMagicNumbers;
import org.bukkit.inventory.meta.BookMeta;
@ -34,7 +34,7 @@ index 03b5764552..dfde2c619c 100644
@DelegateDeserialization(SerializableMeta.class)
public class CraftMetaBook extends CraftMetaItem implements BookMeta {
static final ItemMetaKey BOOK_TITLE = new ItemMetaKey("title");
@@ -80,11 +84,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -81,11 +85,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
super(tag);
if (tag.contains(BOOK_TITLE.NBT)) {
@ -48,7 +48,7 @@ index 03b5764552..dfde2c619c 100644
}
if (tag.contains(RESOLVED.NBT)) {
@@ -112,7 +116,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -113,7 +117,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
} else {
page = validatePage(page);
}
@ -58,7 +58,7 @@ index 03b5764552..dfde2c619c 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 16b17c5a62..fd300b0895 100644
index 024631bdae..2ba9b75e33 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -79,6 +79,10 @@ import org.bukkit.inventory.meta.Repairable;
@ -115,5 +115,5 @@ index 0000000000..58a9534816
+ }
+}
--
2.43.0
2.43.2

14
CraftBukkit-Patches/0052-Further-Seed-Customisation.patch
View file

@ -1,4 +1,4 @@
From 086dd4975ad6c935b756e3e989909c20e5bf4a87 Mon Sep 17 00:00:00 2001
From c6105b058424a486ccc2d53d83e5f055973ede12 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 4 Jul 2014 13:28:45 +1000
Subject: [PATCH] Further Seed Customisation
@ -6,7 +6,7 @@ Subject: [PATCH] Further Seed Customisation
Allow server admins that really want to to customise the seeds used in world generation even further.
diff --git a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
index a415d36c53..e35d5b3e9c 100644
index 80bd238581..75d4df1dc6 100644
--- a/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/PlayerChunkMap.java
@@ -202,7 +202,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@ -19,10 +19,10 @@ index a415d36c53..e35d5b3e9c 100644
ThreadedMailbox<Runnable> threadedmailbox = ThreadedMailbox.create(executor, "worldgen");
diff --git a/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java b/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java
index 4521318bcf..b84e1447ad 100644
index 8246789e2b..8fe9b3cc4a 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntitySlime.java
@@ -338,7 +338,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -346,7 +346,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
}
ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(blockposition);
@ -170,10 +170,10 @@ index 6d6b3abd1c..926848b826 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index 96144bab27..9c594767a5 100644
index 447b0ef691..91c542f176 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -217,7 +217,7 @@ public class CraftChunk implements Chunk {
@@ -219,7 +219,7 @@ public class CraftChunk implements Chunk {
@Override
public boolean isSlimeChunk() {
// 987234911L is deterimined in EntitySlime when seeing if a slime can spawn in a chunk
@ -228,5 +228,5 @@ index 7f5f97defc..7882c95f4c 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0053-Safer-JSON-Loading.patch
View file

@ -1,4 +1,4 @@
From 92661ae8fc9205e927ef6028925a6be1595b57ce Mon Sep 17 00:00:00 2001
From 2a183e59b360428cb7371f10f9551295f95166d9 Mon Sep 17 00:00:00 2001
From: Suddenly <suddenly@suddenly.coffee>
Date: Tue, 8 Jul 2014 09:44:18 +1000
Subject: [PATCH] Safer JSON Loading
@ -40,5 +40,5 @@ index c5147ee88c..6e97ee7465 100644
UserCache.LOGGER.warn("Failed to load profile cache {}", this.file, ioexception);
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0054-Add-CommandLine-EULA-Flag.patch
View file

@ -1,4 +1,4 @@
From fd7aa62110c6fab820a8c965e1d3c635b0c29dcc Mon Sep 17 00:00:00 2001
From c48b83af5b84cbca581756269205127614f0b91c Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 9 Jul 2014 10:35:44 +1000
Subject: [PATCH] Add CommandLine EULA Flag
@ -30,5 +30,5 @@ index b7a570be3c..2d053758d6 100644
return;
}
--
2.43.0
2.43.2

8
CraftBukkit-Patches/0055-Prevent-a-crash-involving-attributes.patch
View file

@ -1,14 +1,14 @@
From 7c25c7601db184dd02e542c4a0e03403ddb78e54 Mon Sep 17 00:00:00 2001
From 686131fb77407cc5f4285e376bef5b6108e1a721 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 53405191f6..2e65e65d31 100644
index 8c5cefbf65..5183819045 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2004,7 +2004,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2072,7 +2072,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> { });
@ -26,5 +26,5 @@ index 53405191f6..2e65e65d31 100644
}
--
2.43.0
2.43.2

6
CraftBukkit-Patches/0056-Make-moved-wrongly-limit-configurable.patch
View file

@ -1,11 +1,11 @@
From b30e76ae275624d05f07179a23d053ae059f6569 Mon Sep 17 00:00:00 2001
From 3b4a452ee8e4271fefef56714c4a2d4641a926aa Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Fri, 4 Jul 2014 23:03:13 +0200
Subject: [PATCH] Make "moved wrongly" limit configurable
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index b886a48c6f..968dd9504c 100644
index 24137a61fc..00719d88b8 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -546,7 +546,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@ -42,5 +42,5 @@ index dcb5270691..d1e6921c1d 100644
+ }
}
--
2.43.0
2.43.2

6
CraftBukkit-Patches/0057-Make-moved-too-quickly-limit-configurable.patch
View file

@ -1,11 +1,11 @@
From 84bb517d6bc74293bf62dfe3d25847a0ab0139df Mon Sep 17 00:00:00 2001
From 74527cdac46e54e2dc9cc3c6391f88789c64acea Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Tue, 22 Jul 2014 15:59:01 +0200
Subject: [PATCH] Make "moved too quickly" limit configurable
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 968dd9504c..17892326f8 100644
index 00719d88b8..b7c75bd7a5 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -511,7 +511,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@ -42,5 +42,5 @@ index d1e6921c1d..0ace6c586c 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0058-Apply-NBTReadLimiter-to-more-things.patch
View file

@ -1,4 +1,4 @@
From d57d2287f87345cf92238707fd78cdb94ce868b7 Mon Sep 17 00:00:00 2001
From 4d82fa254f468a2f4c24458c8d33a8a3fee2c177 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 27 Jul 2014 20:46:04 +1000
Subject: [PATCH] Apply NBTReadLimiter to more things.
@ -67,5 +67,5 @@ index 0000000000..e74c61ca9b
+ }
+}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0059-Allow-Attribute-Capping.patch
View file

@ -1,4 +1,4 @@
From 6f496ce812b7bd3e6ee6a9545a317a8b4759fa47 Mon Sep 17 00:00:00 2001
From 6071fdaaf81199be7c09d53e1c86190b1c529e36 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 28 Jul 2014 16:55:51 +1000
Subject: [PATCH] Allow Attribute Capping.
@ -61,5 +61,5 @@ index 0ace6c586c..aa9fb1cb0c 100644
+ }
}
--
2.43.0
2.43.2

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

@ -1,11 +1,11 @@
From cdda93c3ae3fc335a170173706b8f89ede30497a Mon Sep 17 00:00:00 2001
From 373eb2d730a108cf0b6f6b34da41b2d7b39f3db5 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 c2dc160021..c8fa1d9fb5 100644
index 8624d54438..52184e9e45 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -2048,6 +2048,29 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -39,5 +39,5 @@ index c2dc160021..c8fa1d9fb5 100644
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof EntityPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
for (org.bukkit.entity.HumanEntity h : Lists.newArrayList(((org.bukkit.inventory.InventoryHolder) entity.getBukkitEntity()).getInventory().getViewers())) {
--
2.43.0
2.43.2

10
CraftBukkit-Patches/0061-Add-Hunger-Config-Values.patch
View file

@ -1,4 +1,4 @@
From 01d719658ca834d025c832c0bb0d7a4299e40d18 Mon Sep 17 00:00:00 2001
From 288a440989bf3cb27df41709a8f74c7a964d412c Mon Sep 17 00:00:00 2001
From: lazertester <austin.techhead@gmail.com>
Date: Sun, 17 Aug 2014 19:56:17 +1000
Subject: [PATCH] Add Hunger Config Values
@ -49,10 +49,10 @@ index 6e9a91900e..001fbcbee5 100644
}
} else if (this.isFallFlying()) {
diff --git a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
index ee2ca32701..31b4253f8e 100644
index 3fc1cd845b..1de4baa7c3 100644
--- a/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
+++ b/src/main/java/net/minecraft/world/entity/player/EntityHuman.java
@@ -1387,7 +1387,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1389,7 +1389,7 @@ public abstract class EntityHuman extends EntityLiving {
}
}
@ -61,7 +61,7 @@ index ee2ca32701..31b4253f8e 100644
} else {
this.level().playSound((EntityHuman) null, this.getX(), this.getY(), this.getZ(), SoundEffects.PLAYER_ATTACK_NODAMAGE, this.getSoundSource(), 1.0F, 1.0F);
if (flag4) {
@@ -1567,9 +1567,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1576,9 +1576,9 @@ public abstract class EntityHuman extends EntityLiving {
super.jumpFromGround();
this.awardStat(StatisticList.JUMP);
if (this.isSprinting()) {
@ -122,5 +122,5 @@ index 7882c95f4c..1b5d1e2837 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0062-Make-debug-logging-togglable.patch
View file

@ -1,4 +1,4 @@
From 01be14cbbe4eae471da86d03955dda9885eb11fc Mon Sep 17 00:00:00 2001
From e9cbb53791838a51bf43f4a72ab540c32fbc2ec9 Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Sun, 17 Aug 2014 12:42:53 +0200
Subject: [PATCH] Make debug logging togglable.
@ -65,5 +65,5 @@ index 40be2a9680..722ca84968 100644
</Loggers>
</Configuration>
--
2.43.0
2.43.2

8
CraftBukkit-Patches/0063-Limit-TNT-Detonations-per-tick.patch
View file

@ -1,4 +1,4 @@
From b135dc73afcf90ce540e61efcb46dc27aa727f41 Mon Sep 17 00:00:00 2001
From 5147044228b0388c19c09f2cfb4fc917b9914ff7 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 20 Aug 2014 18:12:32 -0400
Subject: [PATCH] Limit TNT Detonations per tick
@ -7,10 +7,10 @@ This gives a per-world control on how much TNT will be processed per-tick,
preventing a massive TNT detonation from lagging out the server.
diff --git a/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java b/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java
index 62ca85f3c1..5ea5333bf5 100644
index c000a99f1e..bf9a391408 100644
--- a/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/world/entity/item/EntityTNTPrimed.java
@@ -72,6 +72,7 @@ public class EntityTNTPrimed extends Entity implements TraceableEntity {
@@ -73,6 +73,7 @@ public class EntityTNTPrimed extends Entity implements TraceableEntity {
@Override
public void tick() {
@ -51,5 +51,5 @@ index 1b5d1e2837..8411f9e573 100644
+ }
}
--
2.43.0
2.43.2

8
CraftBukkit-Patches/0064-Configurable-Hanging-Tick.patch
View file

@ -1,14 +1,14 @@
From 845e5c0f03dde3cf6a073c4e8fbd663a8c68627a Mon Sep 17 00:00:00 2001
From 88487c51272544c2fd3c0d0e8ebe8876991177c0 Mon Sep 17 00:00:00 2001
From: drXor <mcyoung@mit.edu>
Date: Sat, 9 Aug 2014 13:56:51 -0400
Subject: [PATCH] Configurable Hanging Tick
diff --git a/src/main/java/net/minecraft/world/entity/decoration/EntityHanging.java b/src/main/java/net/minecraft/world/entity/decoration/EntityHanging.java
index 99cfb02282..041b0dc8e0 100644
index 27aac713b7..f484122d10 100644
--- a/src/main/java/net/minecraft/world/entity/decoration/EntityHanging.java
+++ b/src/main/java/net/minecraft/world/entity/decoration/EntityHanging.java
@@ -119,7 +119,7 @@ public abstract class EntityHanging extends Entity {
@@ -120,7 +120,7 @@ public abstract class EntityHanging extends Entity {
public void tick() {
if (!this.level().isClientSide) {
this.checkBelowWorld();
@ -33,5 +33,5 @@ index 8411f9e573..76aeff3324 100644
+ }
}
--
2.43.0
2.43.2

28
CraftBukkit-Patches/0065-BungeeCord-Chat-API.patch
View file

@ -1,4 +1,4 @@
From 5591dd91ba91c3e8f5358d97df11897a2c2fc1f2 Mon Sep 17 00:00:00 2001
From 4c6a7c558ee4d3e409ec64a3ac119e5ebb135403 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
@ -22,10 +22,10 @@ index 08d58de504..6b348478e6 100644
this(packetdataserializer.readComponentTrusted(), packetdataserializer.readBoolean());
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 57483ca5c2..9ed6a062b7 100644
index 59e58112c8..101e54b2e3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -260,6 +260,8 @@ import org.yaml.snakeyaml.Yaml;
@@ -262,6 +262,8 @@ import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.error.MarkedYAMLException;
@ -34,7 +34,7 @@ index 57483ca5c2..9ed6a062b7 100644
public final class CraftServer implements Server {
private final String serverName = "CraftBukkit";
private final String serverVersion;
@@ -2505,6 +2507,20 @@ public final class CraftServer implements Server {
@@ -2517,6 +2519,20 @@ public final class CraftServer implements Server {
public void restart() {
org.spigotmc.RestartCommand.restart();
}
@ -90,10 +90,10 @@ index 861739d4c4..6b36321091 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 ced47e0a65..cf887003bd 100644
index a2d4fac745..6f1a92cd2a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -57,6 +57,8 @@ import org.bukkit.util.BoundingBox;
@@ -58,6 +58,8 @@ import org.bukkit.util.BoundingBox;
import org.bukkit.util.NumberConversions;
import org.bukkit.util.Vector;
@ -102,7 +102,7 @@ index ced47e0a65..cf887003bd 100644
public abstract class CraftEntity implements org.bukkit.entity.Entity {
private static PermissibleBase perm;
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
@@ -870,6 +872,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -871,6 +873,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()
{
@ -130,10 +130,10 @@ index ced47e0a65..cf887003bd 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 2e65e65d31..552d9d8a46 100644
index 5183819045..c74b3a3fe5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -176,6 +176,8 @@ import org.bukkit.profile.PlayerProfile;
@@ -182,6 +182,8 @@ import org.bukkit.profile.PlayerProfile;
import org.bukkit.scoreboard.Scoreboard;
import org.jetbrains.annotations.NotNull;
@ -142,7 +142,7 @@ index 2e65e65d31..552d9d8a46 100644
@DelegateDeserialization(CraftOfflinePlayer.class)
public class CraftPlayer extends CraftHumanEntity implements Player {
private long firstPlayed = 0;
@@ -2221,6 +2223,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2289,6 +2291,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}
@ -192,10 +192,10 @@ index 2e65e65d31..552d9d8a46 100644
public Player.Spigot spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
index dfde2c619c..4a94655108 100644
index 391ed14231..8d3446dc29 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -22,6 +22,9 @@ import org.bukkit.inventory.meta.BookMeta;
@@ -23,6 +23,9 @@ import org.bukkit.inventory.meta.BookMeta;
// Spigot start
import static org.spigotmc.ValidateUtils.*;
@ -205,7 +205,7 @@ index dfde2c619c..4a94655108 100644
// Spigot end
@DelegateDeserialization(SerializableMeta.class)
@@ -428,6 +431,94 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -429,6 +432,94 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
// Spigot start
private BookMeta.Spigot spigot = new SpigotMeta();
private class SpigotMeta extends BookMeta.Spigot {
@ -301,5 +301,5 @@ index dfde2c619c..4a94655108 100644
@Override
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0066-Allow-Capping-Tile-Entity-Tick-Time.patch
View file

@ -1,4 +1,4 @@
From 66ef412e806373c7c56593cf87df5b06bee4e463 Mon Sep 17 00:00:00 2001
From 369228237e5fb47d70df4c7397a50eed2ba9f7bb Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 20 Feb 2015 21:39:31 +1100
Subject: [PATCH] Allow Capping (Tile)Entity Tick Time.
@ -105,5 +105,5 @@ index 0000000000..23a39382be
+ }
+}
--
2.43.0
2.43.2

18
CraftBukkit-Patches/0067-Use-Map-for-getPlayer-String-lookup.patch
View file

@ -1,14 +1,14 @@
From b68e3d49e4d2b67dadff08bfccd6db50a127132d Mon Sep 17 00:00:00 2001
From 6f8f49f054cb347a3175277ff39eb0a803589404 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 13 Jul 2015 19:05:15 +1000
Subject: [PATCH] Use Map for getPlayer(String) lookup.
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 882d3986f8..5cc31a07d9 100644
index 0e4ba589c9..377dbcd3d7 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -155,6 +155,7 @@ public abstract class PlayerList {
@@ -156,6 +156,7 @@ public abstract class PlayerList {
// CraftBukkit start
private CraftServer cserver;
@ -16,7 +16,7 @@ index 882d3986f8..5cc31a07d9 100644
public PlayerList(MinecraftServer minecraftserver, LayeredRegistryAccess<RegistryLayer> layeredregistryaccess, WorldNBTStorage worldnbtstorage, int i) {
this.cserver = minecraftserver.server = new CraftServer((DedicatedServer) minecraftserver, this);
@@ -279,6 +280,7 @@ public abstract class PlayerList {
@@ -280,6 +281,7 @@ public abstract class PlayerList {
// entityplayer.connection.send(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(this.players)); // CraftBukkit - replaced with loop below
this.players.add(entityplayer);
@ -24,7 +24,7 @@ index 882d3986f8..5cc31a07d9 100644
this.playersByUUID.put(entityplayer.getUUID(), entityplayer);
// this.broadcastAll(ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(List.of(entityplayer))); // CraftBukkit - replaced with loop below
@@ -533,6 +535,7 @@ public abstract class PlayerList {
@@ -534,6 +536,7 @@ public abstract class PlayerList {
worldserver.removePlayerImmediately(entityplayer, Entity.RemovalReason.UNLOADED_WITH_PLAYER);
entityplayer.getAdvancements().stopListening();
this.players.remove(entityplayer);
@ -32,7 +32,7 @@ index 882d3986f8..5cc31a07d9 100644
this.server.getCustomBossEvents().onPlayerDisconnect(entityplayer);
UUID uuid = entityplayer.getUUID();
EntityPlayer entityplayer1 = (EntityPlayer) this.playersByUUID.get(uuid);
@@ -685,6 +688,7 @@ public abstract class PlayerList {
@@ -686,6 +689,7 @@ public abstract class PlayerList {
public EntityPlayer respawn(EntityPlayer entityplayer, WorldServer worldserver, boolean flag, Location location, boolean avoidSuffocation, RespawnReason reason) {
entityplayer.stopRiding(); // CraftBukkit
this.players.remove(entityplayer);
@ -40,7 +40,7 @@ index 882d3986f8..5cc31a07d9 100644
entityplayer.serverLevel().removePlayerImmediately(entityplayer, Entity.RemovalReason.DISCARDED);
BlockPosition blockposition = entityplayer.getRespawnPosition();
float f = entityplayer.getRespawnAngle();
@@ -805,6 +809,7 @@ public abstract class PlayerList {
@@ -806,6 +810,7 @@ public abstract class PlayerList {
if (!entityplayer.connection.isDisconnected()) {
worldserver1.addRespawnedPlayer(entityplayer1);
this.players.add(entityplayer1);
@ -48,7 +48,7 @@ index 882d3986f8..5cc31a07d9 100644
this.playersByUUID.put(entityplayer1.getUUID(), entityplayer1);
}
// entityplayer1.initInventoryMenu();
@@ -1008,17 +1013,7 @@ public abstract class PlayerList {
@@ -1009,17 +1014,7 @@ public abstract class PlayerList {
@Nullable
public EntityPlayer getPlayerByName(String s) {
@ -68,5 +68,5 @@ index 882d3986f8..5cc31a07d9 100644
public void broadcast(@Nullable EntityHuman entityhuman, double d0, double d1, double d2, double d3, ResourceKey<World> resourcekey, Packet<?> packet) {
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0068-Clear-Packet-Queue-on-Disconnect.patch
View file

@ -1,4 +1,4 @@
From fe1b25338976f7196c00a8defc0aaaef993b3b8c Mon Sep 17 00:00:00 2001
From 862592eb60a900d2e7dd89d9216862d23684acd4 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 22 Jul 2015 19:04:37 +1000
Subject: [PATCH] Clear Packet Queue on Disconnect
@ -30,5 +30,5 @@ index 66fc312e1f..68eb94b84e 100644
} else if (packet instanceof PacketPlayOutSpawnPosition) {
PacketPlayOutSpawnPosition packet6 = (PacketPlayOutSpawnPosition) packet;
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0069-Configurable-Advancement-Disabling.patch
View file

@ -1,4 +1,4 @@
From b2c27b1500a31571ad82fcb19ff70b9bea997468 Mon Sep 17 00:00:00 2001
From 51450344acede0d71c287a13d5c28ec18dd4b709 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 9 Jun 2017 16:29:31 +1000
Subject: [PATCH] Configurable Advancement Disabling
@ -51,5 +51,5 @@ index 18de718950..05a553977d 100644
+ }
}
--
2.43.0
2.43.2

6
CraftBukkit-Patches/0070-Add-creative-mode-NBT-permissions.patch
View file

@ -1,4 +1,4 @@
From 981ab14eb8d01ae2e02b1a4c3cc7bae32bda1829 Mon Sep 17 00:00:00 2001
From 6b646661fa54fbeaa16b53a99969b342e46823c2 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 25 Feb 2019 19:26:56 +1100
Subject: [PATCH] Add creative mode NBT permissions
@ -24,7 +24,7 @@ index 44106fed1d..9347bebdd3 100644
this.player.connection.send(new PacketPlayOutBlockChange(blockposition, this.level.getBlockState(blockposition)));
this.debugLogging(blockposition, false, j, "block action restricted");
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
index 17892326f8..9994b67462 100644
index b7c75bd7a5..b90c831199 100644
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
@@ -2810,7 +2810,7 @@ public class PlayerConnection extends ServerCommonPacketListenerImpl implements
@ -80,5 +80,5 @@ index 75f8d47a20..525ebf961e 100644
}
}
--
2.43.0
2.43.2

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

@ -1,4 +1,4 @@
From a225861b0ebcdff9422a06296aeaf20bd492f831 Mon Sep 17 00:00:00 2001
From 2b597c4c236174a103e5a1b53be2e6f8e8b934ec 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
@ -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 6f0498a455..1d3d2512ce 100644
index 7ff06ffff7..26da3d8c36 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -377,6 +377,7 @@ public abstract class Entity implements INamableTileEntity, EntityAccess, IComma
@@ -378,6 +378,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();
@ -134,5 +134,5 @@ index 6f0498a455..1d3d2512ce 100644
this.eyeHeight = this.getEyeHeight(EntityPose.STANDING, this.dimensions);
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0072-Allow-Reading-Old-Large-Chunks.patch
View file

@ -1,4 +1,4 @@
From 97b71dd0e68b5f7490b446d3fb19bdfb79246fc2 Mon Sep 17 00:00:00 2001
From f2e7567c7701cf7792b011e4f5bf145c9c4432f1 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 19 Feb 2019 22:30:00 +1100
Subject: [PATCH] Allow Reading Old Large Chunks
@ -42,5 +42,5 @@ index c62c8cbab6..c78c5468cb 100644
ByteBuffer bytebuffer = ByteBuffer.allocate(l);
--
2.43.0
2.43.2

12
CraftBukkit-Patches/0073-Add-log-villager-deaths-option.patch
View file

@ -1,14 +1,14 @@
From 4e616dd36a779be148c5a1a0ffced5be23f0af73 Mon Sep 17 00:00:00 2001
From 9f1e844bb914cb18a76c05f4aafac66b96e7026d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 14 Dec 2019 10:26:52 +1100
Subject: [PATCH] Add log-villager-deaths option
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
index c95f1f58e5..8eb48ef155 100644
index eb14219839..2e478a8c15 100644
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
@@ -1673,7 +1673,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
@@ -1682,7 +1682,7 @@ public abstract class EntityLiving extends Entity implements Attackable {
}
if (!this.level().isClientSide && this.hasCustomName()) {
@ -18,10 +18,10 @@ index c95f1f58e5..8eb48ef155 100644
this.dead = true;
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 32bfae71eb..fd8a918f26 100644
index d14465a86d..bd4afafd9e 100644
--- a/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/EntityVillager.java
@@ -666,7 +666,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -667,7 +667,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@Override
public void die(DamageSource damagesource) {
@ -47,5 +47,5 @@ index 05a553977d..ce8f8c88d9 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0074-Allow-Disabling-Player-Data-Saving.patch
View file

@ -1,4 +1,4 @@
From af454fea1e425084a30b8ddd6ef208c1e353a7e9 Mon Sep 17 00:00:00 2001
From 3d7d3a0874dfc6e99400185742320deda2a8d1e0 Mon Sep 17 00:00:00 2001
From: Sander Knauff <sanderknauff@hotmail.com>
Date: Sat, 7 Nov 2020 18:23:42 +1100
Subject: [PATCH] Allow Disabling Player Data Saving
@ -31,5 +31,5 @@ index ce8f8c88d9..d9ab3f622d 100644
+ }
}
--
2.43.0
2.43.2

6
CraftBukkit-Patches/0075-Configurable-Thunder-Chance.patch
View file

@ -1,11 +1,11 @@
From d831e16c18c73ecb052e6228547ff50ac0d7225f Mon Sep 17 00:00:00 2001
From 0f796d7f6bec5c677586b6859365b43b99eb1826 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 24 Oct 2021 20:29:25 +1100
Subject: [PATCH] Configurable Thunder Chance
diff --git a/src/main/java/net/minecraft/server/level/WorldServer.java b/src/main/java/net/minecraft/server/level/WorldServer.java
index c8fa1d9fb5..8c1a1eec97 100644
index 52184e9e45..6688a49698 100644
--- a/src/main/java/net/minecraft/server/level/WorldServer.java
+++ b/src/main/java/net/minecraft/server/level/WorldServer.java
@@ -518,7 +518,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@ -33,5 +33,5 @@ index 68cf01386e..b6ac09ee9f 100644
+ }
}
--
2.43.0
2.43.2

4
CraftBukkit-Patches/0076-Configurable-Below-Zero-Generation.patch
View file

@ -1,4 +1,4 @@
From c6b4c653d4f362532260926e1eefca838f5ca2a5 Mon Sep 17 00:00:00 2001
From 77db393b5ba7db39ecefcb2a5aff38e568c2890b Mon Sep 17 00:00:00 2001
From: DerFrZocker <derrieple@gmail.com>
Date: Sun, 28 Nov 2021 12:09:29 +1100
Subject: [PATCH] Configurable Below Zero Generation
@ -65,5 +65,5 @@ index b6ac09ee9f..ebddbf6d0c 100644
+ }
}
--
2.43.0
2.43.2