Update to Minecraft 1.21.3

This commit is contained in:
md_5 2024-10-24 06:15:00 +11:00
parent a084d85da8
commit 5eb8a94b2f
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
14 changed files with 56 additions and 56 deletions

View file

@ -1,11 +1,11 @@
From 291aa3d3b4b3e8d1feff90375512537455cb0954 Mon Sep 17 00:00:00 2001
From be172e1447bfa82362b0375a05c4ed999fe97405 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 1d1e06c82..feb3b07e3 100644
index 1d1e06c8..feb3b07e 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -55,6 +55,10 @@
@ -20,7 +20,7 @@ index 1d1e06c82..feb3b07e3 100644
<!-- See https://checkstyle.org/checks/imports/index.html -->
<module name="AvoidStarImport">
diff --git a/pom.xml b/pom.xml
index b49d58ebb..ed68ae3f1 100644
index a8f0b14f..8a690058 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
@ -31,7 +31,7 @@ index b49d58ebb..ed68ae3f1 100644
- <artifactId>bukkit</artifactId>
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot-api</artifactId>
<version>1.21.2-R0.1-SNAPSHOT</version>
<version>1.21.3-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Bukkit</name>

View file

@ -1,11 +1,11 @@
From 69baa371687924746558169e3b3dd60b000ad593 Mon Sep 17 00:00:00 2001
From 3e4e395c8289219ff3354a607ecef1c7d25861c4 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 083b98a99..eeb34a674 100644
index 083b98a9..eeb34a67 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2151,4 +2151,9 @@ public final class Bukkit {
@ -19,7 +19,7 @@ index 083b98a99..eeb34a674 100644
+ }
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index b57405353..36fbd94a9 100644
index b5740535..36fbd94a 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1834,4 +1834,13 @@ public interface Server extends PluginMessageRecipient {
@ -37,7 +37,7 @@ index b57405353..36fbd94a9 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index e82e4d49d..53cb50e63 100644
index e82e4d49..53cb50e6 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -2828,6 +2828,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@ -57,7 +57,7 @@ index e82e4d49d..53cb50e63 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 a7a2587b4..4b6b95404 100644
index a7a2587b..4b6b9540 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,7 +75,7 @@ index a7a2587b4..4b6b95404 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index dee99ac29..558fe6e23 100644
index dee99ac2..558fe6e2 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -766,4 +766,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@ -94,7 +94,7 @@ index dee99ac29..558fe6e23 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
index 158ac20f8..d913298ea 100644
index 158ac20f..d913298e 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 158ac20f8..d913298ea 100644
+ // Spigot end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index a5cbf0f41..f0d7c2951 100644
index 3046ffe7..fa02099c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2262,4 +2262,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2287,4 +2287,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return whether the player allows server listings
*/
public boolean isAllowingServerListings();
@ -139,7 +139,7 @@ index a5cbf0f41..f0d7c2951 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 1be27b04c..8a01c92d7 100644
index 1be27b04..8a01c92d 100644
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
@@ -113,4 +113,13 @@ public interface BookMeta extends WritableBookMeta {

View file

@ -1,14 +1,14 @@
From ac1e58ef6f226ee1c53b82571faa0c0ac4be7c52 Mon Sep 17 00:00:00 2001
From 7d0b01101d3ecfdfe8e0a0da8eb7e621749df7e5 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 f0d7c2951..9cfcd2f56 100644
index fa02099c..975305be 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2266,6 +2266,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2291,6 +2291,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Spigot start
public class Spigot extends Entity.Spigot {

View file

@ -1,14 +1,14 @@
From 74e44a1d1adba9a98340413c287f51a2db18ed52 Mon Sep 17 00:00:00 2001
From ba9ed20617e2ca645a2252ad49f2ad446319d4c8 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 9cfcd2f56..0bca14f60 100644
index 975305be..8ac939b4 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2276,6 +2276,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2301,6 +2301,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public InetSocketAddress getRawAddress() {
throw new UnsupportedOperationException("Not supported yet.");
}

View file

@ -1,14 +1,14 @@
From 299f0f4401888fa85164900605712a615344b79f Mon Sep 17 00:00:00 2001
From 1c76fd82d51bb9dcfcda22e4e0fd62dbfe247ab3 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 0bca14f60..df1649e7e 100644
index 8ac939b4..41a9a202 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2283,6 +2283,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2308,6 +2308,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
public void respawn() {
throw new UnsupportedOperationException("Not supported yet.");
}

View file

@ -1,11 +1,11 @@
From 6c81993580fb480c18ca6e9f15c4bd0248c10e9b Mon Sep 17 00:00:00 2001
From e8c96c07858185902f2d147ae2670bb743c4bdf2 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 ed68ae3f1..9a148bbfa 100644
index 8a690058..bdde86ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,13 @@
@ -23,7 +23,7 @@ index ed68ae3f1..9a148bbfa 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 6149c77df..e3f185dc9 100644
index 6149c77d..e3f185dc 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,7 +285,7 @@ index 6149c77df..e3f185dc9 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 4a965bbbd..28845367c 100644
index 4a965bbb..28845367 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1842,6 +1842,24 @@ public interface Server extends PluginMessageRecipient {
@ -314,7 +314,7 @@ index 4a965bbbd..28845367c 100644
@NotNull
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
index 4b6b95404..284be63a1 100644
index 4b6b9540..284be63a 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 4b6b95404..284be63a1 100644
@NotNull
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index df1649e7e..6ab826640 100644
index 41a9a202..13bd9649 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2293,6 +2293,58 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2318,6 +2318,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 df1649e7e..6ab826640 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 8a01c92d7..9bab73c3c 100644
index 8a01c92d..9bab73c3 100644
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
@@ -1,5 +1,7 @@

View file

@ -1,4 +1,4 @@
From ad2350f0ba5b038bf1fd99c2c0ee50fd993e12f1 Mon Sep 17 00:00:00 2001
From c1cc03dc0213bb481881531405c0ad5ec50860f1 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 12feab88bc..3150fd744e 100644
<!-- See https://checkstyle.org/checks/imports/index.html -->
<module name="AvoidStarImport">
diff --git a/pom.xml b/pom.xml
index a228e5f615..da3dad9b74 100644
index e64f605662..c2973479d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,20 @@
@ -46,7 +46,7 @@ index a228e5f615..da3dad9b74 100644
+ <groupId>org.spigotmc</groupId>
+ <artifactId>spigot</artifactId>
<packaging>jar</packaging>
<version>1.21.2-R0.1-SNAPSHOT</version>
<version>1.21.3-R0.1-SNAPSHOT</version>
- <name>CraftBukkit</name>
+ <name>Spigot</name>
<url>https://www.spigotmc.org/</url>

View file

@ -1,4 +1,4 @@
From 74487ac800d14344d43f72f1b7c4327895ba1805 Mon Sep 17 00:00:00 2001
From 08e7661b34053cddee5ba2cba8ecb4f81364f981 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
@ -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 1c9ae250b4..eb5fec1820 100644
index fa364aa322..241a17ddd9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2343,4 +2343,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2357,4 +2357,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean isAllowingServerListings() {
return getHandle().allowsListing();
}

View file

@ -1,4 +1,4 @@
From 73f54a19bac1f874b74c0b66387e5dfd1ad53317 Mon Sep 17 00:00:00 2001
From d7386ad104c37103e09df6ef685ba15803c57b54 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
@ -201,10 +201,10 @@ index ff47b09dcc..f9aba6e6d0 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 eb5fec1820..ed891e2ecd 100644
index 241a17ddd9..0738f19a44 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -492,6 +492,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -496,6 +496,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void kickPlayer(String message) {

View file

@ -1,14 +1,14 @@
From 390155b718ff9ec45d31488dba1aad287201a02a Mon Sep 17 00:00:00 2001
From d0448063b1d4a78b89d433a61514a6691c0f1d3a 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 ed891e2ecd..cd470abce3 100644
index 0738f19a44..f7924ed180 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2348,6 +2348,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2362,6 +2362,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Spigot start
private final Player.Spigot spigot = new Player.Spigot()
{

View file

@ -1,4 +1,4 @@
From e8fa11b576ab3d748fe06ae92c587e299390f883 Mon Sep 17 00:00:00 2001
From 0d7e514340a7c950272b8918c0ff24a8a861ade2 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
@ -258,10 +258,10 @@ index 1887cd41ec..e58a0762c0 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 cd470abce3..8ed71909a6 100644
index f7924ed180..595d83679a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2349,6 +2349,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2363,6 +2363,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
private final Player.Spigot spigot = new Player.Spigot()
{

View file

@ -1,14 +1,14 @@
From f5364fe23adae29c4d0498743e88efbe26361c41 Mon Sep 17 00:00:00 2001
From 43b5056371684090ecd91947623bad4089e61443 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 8ed71909a6..c9627e6f6f 100644
index 595d83679a..a8d7d25a20 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2363,6 +2363,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2377,6 +2377,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
server.getServer().getPlayerList().respawn( getHandle(), false, Entity.RemovalReason.KILLED, org.bukkit.event.player.PlayerRespawnEvent.RespawnReason.PLUGIN );
}
}

View file

@ -1,14 +1,14 @@
From 44f36b44c75a85d04d4d2434292ca59a2689fbb3 Mon Sep 17 00:00:00 2001
From 20239c9301a43616f1232e3c79d1dd86a55ad6b9 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 c9627e6f6f..7615a15a56 100644
index a8d7d25a20..3510695b9a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2165,7 +2165,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2179,7 +2179,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
AttributeModifiable dummy = new AttributeModifiable(GenericAttributes.MAX_HEALTH, (attribute) -> { });

View file

@ -1,4 +1,4 @@
From 1dc7973a2a0528e5349af155bdf3131b8ecb6789 Mon Sep 17 00:00:00 2001
From 027e053d6dae720c0e4f9f8e5a7fd47a5a417beb 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
@ -130,10 +130,10 @@ index f9aba6e6d0..254cc3d5b0 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 7615a15a56..b7f6418e0f 100644
index 3510695b9a..f9625bf583 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -196,6 +196,8 @@ import org.bukkit.profile.PlayerProfile;
@@ -200,6 +200,8 @@ import org.bukkit.profile.PlayerProfile;
import org.bukkit.scoreboard.Scoreboard;
import org.jetbrains.annotations.NotNull;
@ -142,7 +142,7 @@ index 7615a15a56..b7f6418e0f 100644
@DelegateDeserialization(CraftOfflinePlayer.class)
public class CraftPlayer extends CraftHumanEntity implements Player {
private long firstPlayed = 0;
@@ -2386,6 +2388,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2400,6 +2402,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
}