Skip to content

Commit 26734e8

Browse files
authored
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7454)
* Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 8085edd SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls 04c7e13 PR-719: Add Player Profile API 7156421 SPIGOT-6910: Add BlockDamageAbortEvent CraftBukkit Changes: febaa1c SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls 9dafd10 Don't send updates over large distances bdac46b SPIGOT-6782: EntityPortalEvent should not destroy entity when setTo() uses same world as getFrom() 8f361ec PR-1002: Add Player Profile API 911875d Increase outdated build delay e5f8a76 SPIGOT-6917: Use main scoreboard for /trigger a672a53 Clean up callBlockDamageEvent 8e1bdee SPIGOT-6910: Add BlockDamageAbortEvent Spigot Changes: 6edb62f3 Rebuild patches 7fbc6a1e Rebuild patches * Updated Upstream (CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: de95135 SPIGOT-6927: Fix default value of spawn-limits in Worlds
1 parent 00da098 commit 26734e8

File tree

313 files changed

+1538
-1296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

313 files changed

+1538
-1296
lines changed

patches/api/0006-Timings-v2.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2782,10 +2782,10 @@ index 0000000000000000000000000000000000000000..5989ee21297935651b0edd44b8239e65
27822782
+ }
27832783
+}
27842784
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
2785-
index 072bcbbbf167e02ce5014b672f2cf63122d29b21..de7f303bce9e2454eaec12131cd1439a54281c7e 100644
2785+
index e1cd74a2fb53e054f626641d781e4ac57ea0ea8f..f8001cafc3494675dfa31c0c5feb975c0f066c5d 100644
27862786
--- a/src/main/java/org/bukkit/Bukkit.java
27872787
+++ b/src/main/java/org/bukkit/Bukkit.java
2788-
@@ -747,7 +747,6 @@ public final class Bukkit {
2788+
@@ -787,7 +787,6 @@ public final class Bukkit {
27892789
*/
27902790
public static void reload() {
27912791
server.reload();
@@ -2794,10 +2794,10 @@ index 072bcbbbf167e02ce5014b672f2cf63122d29b21..de7f303bce9e2454eaec12131cd1439a
27942794

27952795
/**
27962796
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
2797-
index 2bfccae871b92749fa5893b5a7ff327fc93695ad..31e989bdaf60d38e14c84c4a0a31ede6e1a72e86 100644
2797+
index 96819d13fa837c7374c5a13bdcad864c6744f0b5..7cc8f68205f7c0ec2ebada5030f944675b776c76 100644
27982798
--- a/src/main/java/org/bukkit/Server.java
27992799
+++ b/src/main/java/org/bukkit/Server.java
2800-
@@ -1500,6 +1500,26 @@ public interface Server extends PluginMessageRecipient {
2800+
@@ -1593,6 +1593,26 @@ public interface Server extends PluginMessageRecipient {
28012801
throw new UnsupportedOperationException("Not supported yet.");
28022802
}
28032803

@@ -3499,7 +3499,7 @@ index a09c3f71ca563b6f40a118ce1344d0eb273bed40..cf2f517765d8f2a23cc4a17d9ee2dcd8
34993499
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
35003500
} else {
35013501
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
3502-
index 6bdd9f1dcc4c69c1811622cddc82526d2f8d9e52..657243776c8a2abb5a57e5c407212a8387d649eb 100644
3502+
index 930f3fe08c2acd70eaf7850d0b1b2890512defa0..24e3eaa008e53af8d77439e4f2ab9007285d7826 100644
35033503
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
35043504
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
35053505
@@ -29,7 +29,8 @@ import org.jetbrains.annotations.Nullable;

patches/api/0007-Add-command-line-option-to-load-extra-plugin-jars-no.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
77
ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
88

99
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
10-
index a238302f2a12194aa30a88867070705dc749b36b..cc42bfa74b41ef6d6374efa7b882f71677fb0824 100644
10+
index f8001cafc3494675dfa31c0c5feb975c0f066c5d..4b5486bec19d330404562814a0c4cf63f2f7ef1d 100644
1111
--- a/src/main/java/org/bukkit/Bukkit.java
1212
+++ b/src/main/java/org/bukkit/Bukkit.java
13-
@@ -73,6 +73,20 @@ public final class Bukkit {
13+
@@ -75,6 +75,20 @@ public final class Bukkit {
1414
return server;
1515
}
1616

@@ -32,10 +32,10 @@ index a238302f2a12194aa30a88867070705dc749b36b..cc42bfa74b41ef6d6374efa7b882f716
3232
* Attempts to set the {@link Server} singleton.
3333
* <p>
3434
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
35-
index 3e91c4000c468fd8bdcb938e942a7bbf4988cab2..1fb1d4f32af8150711ca766fcd7d0a0c177df7c4 100644
35+
index 7cc8f68205f7c0ec2ebada5030f944675b776c76..e38a0d7d48a57364bec0c8d1dc16e256622298a0 100644
3636
--- a/src/main/java/org/bukkit/Server.java
3737
+++ b/src/main/java/org/bukkit/Server.java
38-
@@ -58,6 +58,18 @@ import org.jetbrains.annotations.Nullable;
38+
@@ -60,6 +60,18 @@ import org.jetbrains.annotations.Nullable;
3939
*/
4040
public interface Server extends PluginMessageRecipient {
4141

patches/api/0008-Adventure.patch

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -488,10 +488,10 @@ index 0000000000000000000000000000000000000000..15ecb12fd2fefcac96edbaef7cdd487a
488488
+ }
489489
+}
490490
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
491-
index 0d96b6bdc744a23cc7322f2bd6a7a7b38acb6830..84a620bbbc24ded4075bce0209caed7fa03a92eb 100644
491+
index 4b5486bec19d330404562814a0c4cf63f2f7ef1d..fc7d17fd3028f790ff9e034e8234bf0506f017c2 100644
492492
--- a/src/main/java/org/bukkit/Bukkit.java
493493
+++ b/src/main/java/org/bukkit/Bukkit.java
494-
@@ -369,7 +369,9 @@ public final class Bukkit {
494+
@@ -371,7 +371,9 @@ public final class Bukkit {
495495
*
496496
* @param message the message
497497
* @return the number of players
@@ -501,7 +501,7 @@ index 0d96b6bdc744a23cc7322f2bd6a7a7b38acb6830..84a620bbbc24ded4075bce0209caed7f
501501
public static int broadcastMessage(@NotNull String message) {
502502
return server.broadcastMessage(message);
503503
}
504-
@@ -1012,6 +1014,19 @@ public final class Bukkit {
504+
@@ -1052,6 +1054,19 @@ public final class Bukkit {
505505
server.shutdown();
506506
}
507507

@@ -521,7 +521,7 @@ index 0d96b6bdc744a23cc7322f2bd6a7a7b38acb6830..84a620bbbc24ded4075bce0209caed7f
521521
/**
522522
* Broadcasts the specified message to every user with the given
523523
* permission name.
524-
@@ -1021,6 +1036,21 @@ public final class Bukkit {
524+
@@ -1061,6 +1076,21 @@ public final class Bukkit {
525525
* permissibles} must have to receive the broadcast
526526
* @return number of message recipients
527527
*/
@@ -543,15 +543,15 @@ index 0d96b6bdc744a23cc7322f2bd6a7a7b38acb6830..84a620bbbc24ded4075bce0209caed7f
543543
public static int broadcast(@NotNull String message, @NotNull String permission) {
544544
return server.broadcast(message, permission);
545545
}
546-
@@ -1220,6 +1250,7 @@ public final class Bukkit {
546+
@@ -1299,6 +1329,7 @@ public final class Bukkit {
547547
return server.createInventory(owner, type);
548548
}
549549

550550
+ // Paper start
551551
/**
552552
* Creates an empty inventory with the specified type and title. If the type
553553
* is {@link InventoryType#CHEST}, the new inventory has a size of 27;
554-
@@ -1245,6 +1276,38 @@ public final class Bukkit {
554+
@@ -1324,6 +1355,38 @@ public final class Bukkit {
555555
* @see InventoryType#isCreatable()
556556
*/
557557
@NotNull
@@ -590,15 +590,15 @@ index 0d96b6bdc744a23cc7322f2bd6a7a7b38acb6830..84a620bbbc24ded4075bce0209caed7f
590590
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
591591
return server.createInventory(owner, type, title);
592592
}
593-
@@ -1263,6 +1326,7 @@ public final class Bukkit {
593+
@@ -1342,6 +1405,7 @@ public final class Bukkit {
594594
return server.createInventory(owner, size);
595595
}
596596

597597
+ // Paper start
598598
/**
599599
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
600600
* specified size and title.
601-
@@ -1275,10 +1339,30 @@ public final class Bukkit {
601+
@@ -1354,10 +1418,30 @@ public final class Bukkit {
602602
* @throws IllegalArgumentException if the size is not a multiple of 9
603603
*/
604604
@NotNull
@@ -629,7 +629,7 @@ index 0d96b6bdc744a23cc7322f2bd6a7a7b38acb6830..84a620bbbc24ded4075bce0209caed7f
629629
/**
630630
* Creates an empty merchant.
631631
*
632-
@@ -1286,7 +1370,20 @@ public final class Bukkit {
632+
@@ -1365,7 +1449,20 @@ public final class Bukkit {
633633
* when the merchant inventory is viewed
634634
* @return a new merchant
635635
*/
@@ -650,7 +650,7 @@ index 0d96b6bdc744a23cc7322f2bd6a7a7b38acb6830..84a620bbbc24ded4075bce0209caed7f
650650
public static Merchant createMerchant(@Nullable String title) {
651651
return server.createMerchant(title);
652652
}
653-
@@ -1366,22 +1463,47 @@ public final class Bukkit {
653+
@@ -1471,22 +1568,47 @@ public final class Bukkit {
654654
return server.isPrimaryThread();
655655
}
656656

@@ -802,10 +802,10 @@ index 803fa0019869127ee8c7e4fb1777a59c43e66f8a..c65f0d6569c130b4920a9e71ad24af64
802802
+ // Paper end
803803
}
804804
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
805-
index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f380589dd 100644
805+
index e38a0d7d48a57364bec0c8d1dc16e256622298a0..dd79325a8f52190c44b833870043d167641211a6 100644
806806
--- a/src/main/java/org/bukkit/Server.java
807807
+++ b/src/main/java/org/bukkit/Server.java
808-
@@ -56,7 +56,7 @@ import org.jetbrains.annotations.Nullable;
808+
@@ -58,7 +58,7 @@ import org.jetbrains.annotations.Nullable;
809809
/**
810810
* Represents a server implementation.
811811
*/
@@ -814,7 +814,7 @@ index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f
814814

815815
/**
816816
* Returns the de facto plugins directory, generally used for storing plugin jars to be loaded,
817-
@@ -74,7 +74,7 @@ public interface Server extends PluginMessageRecipient {
817+
@@ -76,7 +76,7 @@ public interface Server extends PluginMessageRecipient {
818818
* Used for all administrative messages, such as an operator using a
819819
* command.
820820
* <p>
@@ -823,7 +823,7 @@ index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f
823823
*/
824824
public static final String BROADCAST_CHANNEL_ADMINISTRATIVE = "bukkit.broadcast.admin";
825825

826-
@@ -82,7 +82,7 @@ public interface Server extends PluginMessageRecipient {
826+
@@ -84,7 +84,7 @@ public interface Server extends PluginMessageRecipient {
827827
* Used for all announcement messages, such as informing users that a
828828
* player has joined.
829829
* <p>
@@ -832,7 +832,7 @@ index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f
832832
*/
833833
public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user";
834834

835-
@@ -304,7 +304,9 @@ public interface Server extends PluginMessageRecipient {
835+
@@ -306,7 +306,9 @@ public interface Server extends PluginMessageRecipient {
836836
*
837837
* @param message the message
838838
* @return the number of players
@@ -842,7 +842,7 @@ index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f
842842
public int broadcastMessage(@NotNull String message);
843843

844844
/**
845-
@@ -856,8 +858,33 @@ public interface Server extends PluginMessageRecipient {
845+
@@ -893,8 +895,33 @@ public interface Server extends PluginMessageRecipient {
846846
* @param permission the required permission {@link Permissible
847847
* permissibles} must have to receive the broadcast
848848
* @return number of message recipients
@@ -876,15 +876,15 @@ index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f
876876

877877
/**
878878
* Gets the player by the given name, regardless if they are offline or
879-
@@ -1022,6 +1049,7 @@ public interface Server extends PluginMessageRecipient {
879+
@@ -1092,6 +1119,7 @@ public interface Server extends PluginMessageRecipient {
880880
@NotNull
881881
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
882882

883883
+ // Paper start
884884
/**
885885
* Creates an empty inventory with the specified type and title. If the type
886886
* is {@link InventoryType#CHEST}, the new inventory has a size of 27;
887-
@@ -1047,6 +1075,36 @@ public interface Server extends PluginMessageRecipient {
887+
@@ -1117,6 +1145,36 @@ public interface Server extends PluginMessageRecipient {
888888
* @see InventoryType#isCreatable()
889889
*/
890890
@NotNull
@@ -921,7 +921,7 @@ index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f
921921
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
922922

923923
/**
924-
@@ -1061,6 +1119,22 @@ public interface Server extends PluginMessageRecipient {
924+
@@ -1131,6 +1189,22 @@ public interface Server extends PluginMessageRecipient {
925925
@NotNull
926926
Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
927927

@@ -944,7 +944,7 @@ index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f
944944
/**
945945
* Creates an empty inventory of type {@link InventoryType#CHEST} with the
946946
* specified size and title.
947-
@@ -1071,10 +1145,13 @@ public interface Server extends PluginMessageRecipient {
947+
@@ -1141,10 +1215,13 @@ public interface Server extends PluginMessageRecipient {
948948
* viewed
949949
* @return a new inventory
950950
* @throws IllegalArgumentException if the size is not a multiple of 9
@@ -958,7 +958,7 @@ index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f
958958
/**
959959
* Creates an empty merchant.
960960
*
961-
@@ -1082,7 +1159,18 @@ public interface Server extends PluginMessageRecipient {
961+
@@ -1152,7 +1229,18 @@ public interface Server extends PluginMessageRecipient {
962962
* when the merchant inventory is viewed
963963
* @return a new merchant
964964
*/
@@ -977,7 +977,7 @@ index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f
977977
Merchant createMerchant(@Nullable String title);
978978

979979
/**
980-
@@ -1146,20 +1234,41 @@ public interface Server extends PluginMessageRecipient {
980+
@@ -1239,20 +1327,41 @@ public interface Server extends PluginMessageRecipient {
981981
*/
982982
boolean isPrimaryThread();
983983

@@ -1019,7 +1019,7 @@ index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f
10191019
String getShutdownMessage();
10201020

10211021
/**
1022-
@@ -1536,7 +1645,9 @@ public interface Server extends PluginMessageRecipient {
1022+
@@ -1629,7 +1738,9 @@ public interface Server extends PluginMessageRecipient {
10231023
* Sends the component to the player
10241024
*
10251025
* @param component the components to send
@@ -1029,7 +1029,7 @@ index 7f4d6d605934e47ec97b8ad7cca3c48460bc0082..ede5de4c310a93989608bf48b3e5116f
10291029
public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
10301030
throw new UnsupportedOperationException("Not supported yet.");
10311031
}
1032-
@@ -1545,7 +1656,9 @@ public interface Server extends PluginMessageRecipient {
1032+
@@ -1638,7 +1749,9 @@ public interface Server extends PluginMessageRecipient {
10331033
* Sends an array of components as a single message to the player
10341034
*
10351035
* @param components the components to send
@@ -1133,10 +1133,10 @@ index efb97712cc9dc7c1e12a59f5b94e4f2ad7c6b7d8..3024468af4c073324e536c1cb26beffb
11331133
return warning == null || warning.value();
11341134
}
11351135
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
1136-
index f24f9391269cb80d1e7142369ca57d0e8e0606af..5d23c38758b4b9eb5802b6a22a094a3adb64e508 100644
1136+
index a855f4c16f52f5ec478538eb182c13f8a6d60f65..33f7f4df53ba52f9afa22662427cbab1876b451c 100644
11371137
--- a/src/main/java/org/bukkit/World.java
11381138
+++ b/src/main/java/org/bukkit/World.java
1139-
@@ -38,7 +38,7 @@ import org.jetbrains.annotations.Nullable;
1139+
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.Nullable;
11401140
/**
11411141
* Represents a world, which may contain entities, chunks and blocks
11421142
*/
@@ -1145,7 +1145,7 @@ index f24f9391269cb80d1e7142369ca57d0e8e0606af..5d23c38758b4b9eb5802b6a22a094a3a
11451145

11461146
/**
11471147
* Gets the {@link Block} at the given coordinates
1148-
@@ -633,6 +633,14 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
1148+
@@ -634,6 +634,14 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
11491149
@NotNull
11501150
public List<Player> getPlayers();
11511151

@@ -1562,7 +1562,7 @@ index 9566e4306ada5e82dede0f002aa06da12c44996b..4d5f0837bd0e02a30c943d8969fb6b13
15621562
+ // Paper end
15631563
}
15641564
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
1565-
index 25a6f9313a1953def7470e411b53016f2ca14bef..10cb6088c4618f228c757f4e592b44edab81c2dc 100644
1565+
index 922d33ff4fa9d901d3c5c0a9f8399ad8aef62c37..cd287978c34873c7122794e4f3e762915978a1f0 100644
15661566
--- a/src/main/java/org/bukkit/entity/Entity.java
15671567
+++ b/src/main/java/org/bukkit/entity/Entity.java
15681568
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
@@ -1574,7 +1574,7 @@ index 25a6f9313a1953def7470e411b53016f2ca14bef..10cb6088c4618f228c757f4e592b44ed
15741574

15751575
/**
15761576
* Gets the entity's current position
1577-
@@ -648,4 +648,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
1577+
@@ -656,4 +656,20 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
15781578
@Override
15791579
Spigot spigot();
15801580
// Spigot end

patches/api/0010-Add-getTPS-method.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method
55

66

77
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
8-
index 84a620bbbc24ded4075bce0209caed7fa03a92eb..bbee4e40917cca4e692c3d60c1c513b4c847160f 100644
8+
index fc7d17fd3028f790ff9e034e8234bf0506f017c2..f5d697e759700b10237494f2587939eea365ab3a 100644
99
--- a/src/main/java/org/bukkit/Bukkit.java
1010
+++ b/src/main/java/org/bukkit/Bukkit.java
11-
@@ -1728,6 +1728,17 @@ public final class Bukkit {
11+
@@ -1833,6 +1833,17 @@ public final class Bukkit {
1212
return server.getEntity(uuid);
1313
}
1414

@@ -27,10 +27,10 @@ index 84a620bbbc24ded4075bce0209caed7fa03a92eb..bbee4e40917cca4e692c3d60c1c513b4
2727
* Get the advancement specified by this key.
2828
*
2929
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
30-
index ede5de4c310a93989608bf48b3e5116f380589dd..835041d2ab6545e52d963d96d558f9a7e52d279a 100644
30+
index dd79325a8f52190c44b833870043d167641211a6..a4ec6dae0b6302b6486bb5105438ef8322b433be 100644
3131
--- a/src/main/java/org/bukkit/Server.java
3232
+++ b/src/main/java/org/bukkit/Server.java
33-
@@ -1461,6 +1461,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
33+
@@ -1554,6 +1554,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
3434
@Nullable
3535
Entity getEntity(@NotNull UUID uuid);
3636

patches/api/0012-Entity-Origin-API.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity Origin API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
8-
index 10cb6088c4618f228c757f4e592b44edab81c2dc..65088203d29798efe211612dfadb356f457ed466 100644
8+
index cd287978c34873c7122794e4f3e762915978a1f0..c315d2494969190f8b53236f905ad5c5cf1bfc39 100644
99
--- a/src/main/java/org/bukkit/entity/Entity.java
1010
+++ b/src/main/java/org/bukkit/entity/Entity.java
11-
@@ -663,5 +663,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
11+
@@ -671,5 +671,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
1212
default net.kyori.adventure.text.event.HoverEvent<net.kyori.adventure.text.event.HoverEvent.ShowEntity> asHoverEvent(final @NotNull java.util.function.UnaryOperator<net.kyori.adventure.text.event.HoverEvent.ShowEntity> op) {
1313
return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.customName())));
1414
}

patches/api/0014-Add-view-distance-API.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Add per player no-tick, tick, and send view distances.
88
Also add send/no-tick view distance to World.
99

1010
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
11-
index 5d23c38758b4b9eb5802b6a22a094a3adb64e508..5e9f77a53bffed2e79200e9d8bb8685d3dd89901 100644
11+
index 33f7f4df53ba52f9afa22662427cbab1876b451c..3742bd5f1a31d45f2ac760f706f6069a88274e27 100644
1212
--- a/src/main/java/org/bukkit/World.java
1313
+++ b/src/main/java/org/bukkit/World.java
14-
@@ -2475,6 +2475,52 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
14+
@@ -2596,6 +2596,52 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
1515
int getSimulationDistance();
1616
// Spigot end
1717

0 commit comments

Comments
 (0)