Commits

md_5 authored 4aa5ead2377
Rebuild patches
No tags

Bukkit-Patches/0002-Skeleton-API-Implementations.patch

Modified
1 -From 18c51757e535f0c841cd2bf479da16073f6440aa Mon Sep 17 00:00:00 2001
1 +From b8db3c20285578fd20ead2e08e2fa48e4215bdc4 Mon Sep 17 00:00:00 2001
2 2 From: md_5 <git@md-5.net>
3 3 Date: Mon, 15 May 2017 15:16:15 +1000
4 4 Subject: [PATCH] Skeleton API Implementations
5 5 ​
6 6 ​
7 7 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
8 8 index 4bc8b661..93aab0be 100644
9 9 --- a/src/main/java/org/bukkit/Bukkit.java
10 10 +++ b/src/main/java/org/bukkit/Bukkit.java
11 11 @@ -1942,4 +1942,9 @@ public final class Bukkit {
30 30 + // Spigot start
31 31 + public class Spigot {
32 32 +
33 33 + }
34 34 +
35 35 + @NotNull
36 36 + Spigot spigot();
37 37 + // Spigot end
38 38 }
39 39 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
40 -index a2774163..4a371ea3 100644
40 +index aa67bd2e..5d2a529d 100644
41 41 --- a/src/main/java/org/bukkit/World.java
42 42 +++ b/src/main/java/org/bukkit/World.java
43 43 @@ -2649,6 +2649,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
44 44 @Nullable
45 45 StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
46 46
47 47 + // Spigot start
48 48 + public class Spigot {
49 49 +
50 50 + }
68 68 + // Spigot start
69 69 + public class Spigot {
70 70 +
71 71 + }
72 72 +
73 73 + @NotNull
74 74 + Spigot spigot();
75 75 + // Spigot end
76 76 }
77 77 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
78 -index 046cf816..922d33ff 100644
78 +index 41866422..259d878d 100644
79 79 --- a/src/main/java/org/bukkit/entity/Entity.java
80 80 +++ b/src/main/java/org/bukkit/entity/Entity.java
81 -@@ -646,4 +646,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
81 +@@ -673,4 +673,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
82 82 */
83 83 @NotNull
84 84 SpawnCategory getSpawnCategory();
85 85 +
86 86 + // Spigot start
87 87 + public class Spigot extends CommandSender.Spigot {
88 88 +
89 89 + }
90 90 +
91 91 + @NotNull
113 113 + public class Spigot extends Entity.Spigot {
114 114 +
115 115 + }
116 116 +
117 117 + @NotNull
118 118 + @Override
119 119 + Spigot spigot();
120 120 + // Spigot end
121 121 }
122 122 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
123 -index d86c5320..260107b5 100644
123 +index 14ca6478..695ee3f0 100644
124 124 --- a/src/main/java/org/bukkit/entity/Player.java
125 125 +++ b/src/main/java/org/bukkit/entity/Player.java
126 -@@ -1577,4 +1577,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
126 +@@ -1601,4 +1601,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
127 127 * @return whether the player allows server listings
128 128 */
129 129 public boolean isAllowingServerListings();
130 130 +
131 131 + // Spigot start
132 132 + public class Spigot extends Entity.Spigot {
133 133 +
134 134 + }
135 135 +
136 136 + @NotNull

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut