@@ -488,10 +488,10 @@ index 0000000000000000000000000000000000000000..15ecb12fd2fefcac96edbaef7cdd487a
488488+ }
489489+ }
490490diff --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 }
804804diff --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 }
11351135diff --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 }
15641564diff --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
0 commit comments