Commits

md_5 authored 60c9969b3e3 
Rebuild patches
No tags
e65d67a7a97
master

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

Modified
1 -From 3e4e395c8289219ff3354a607ecef1c7d25861c4 Mon Sep 17 00:00:00 2001
1 +From bbf7fb244cca333e591de754c7bc31b240ee78d4 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 -index 083b98a9..eeb34a67 100644
8 +index 8b6c906f0..c7e38aee4 100644
9 9 --- a/src/main/java/org/bukkit/Bukkit.java
10 10 +++ b/src/main/java/org/bukkit/Bukkit.java
11 -@@ -2151,4 +2151,9 @@ public final class Bukkit {
11 +@@ -2175,4 +2175,9 @@ public final class Bukkit {
12 12 public static UnsafeValues getUnsafe() {
13 13 return server.getUnsafe();
14 14 }
15 15 +
16 16 + @NotNull
17 17 + public static Server.Spigot spigot() {
18 18 + return server.spigot();
19 19 + }
20 20 }
21 21 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
22 -index b5740535..36fbd94a 100644
22 +index 41cbb3aee..abd04d01c 100644
23 23 --- a/src/main/java/org/bukkit/Server.java
24 24 +++ b/src/main/java/org/bukkit/Server.java
25 -@@ -1834,4 +1834,13 @@ public interface Server extends PluginMessageRecipient {
26 - @Deprecated
25 +@@ -1852,4 +1852,13 @@ public interface Server extends PluginMessageRecipient {
26 + @Deprecated(since = "1.7.2")
27 27 @NotNull
28 28 UnsafeValues getUnsafe();
29 29 +
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 e82e4d49..53cb50e6 100644
40 +index dff198dd7..35c646366 100644
41 41 --- a/src/main/java/org/bukkit/World.java
42 42 +++ b/src/main/java/org/bukkit/World.java
43 43 @@ -2828,6 +2828,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 + }
51 51 +
52 52 + @NotNull
53 53 + Spigot spigot();
54 54 + // Spigot end
55 55 +
56 56 /**
57 57 * Find the closest nearby location with a biome matching the provided
58 58 * {@link Biome}(s). Finding biomes can, and will, block if the world is looking
59 59 diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
60 -index a7a2587b..4b6b9540 100644
60 +index a7a2587b4..4b6b95404 100644
61 61 --- a/src/main/java/org/bukkit/command/CommandSender.java
62 62 +++ b/src/main/java/org/bukkit/command/CommandSender.java
63 63 @@ -53,4 +53,13 @@ public interface CommandSender extends Permissible {
64 64 */
65 65 @NotNull
66 66 public String getName();
67 67 +
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 dee99ac2..558fe6e2 100644
78 +index b57969f15..a4cf548b5 100644
79 79 --- a/src/main/java/org/bukkit/entity/Entity.java
80 80 +++ b/src/main/java/org/bukkit/entity/Entity.java
81 81 @@ -766,4 +766,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
82 82 @NotNull
83 83 @ApiStatus.Experimental
84 84 Entity copy(@NotNull Location to);
85 85 +
86 86 + // Spigot start
87 87 + public class Spigot extends CommandSender.Spigot {
88 88 +
89 89 + }
90 90 +
91 91 + @NotNull
92 92 + @Override
93 93 + Spigot spigot();
94 94 + // Spigot end
95 95 }
96 96 diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
97 -index 158ac20f..d913298e 100644
97 +index 158ac20f8..d913298ea 100644
98 98 --- a/src/main/java/org/bukkit/entity/LightningStrike.java
99 99 +++ b/src/main/java/org/bukkit/entity/LightningStrike.java
100 100 @@ -2,6 +2,7 @@ package org.bukkit.entity;
101 101
102 102 import org.bukkit.GameEvent;
103 103 import org.bukkit.enchantments.Enchantment;
104 104 +import org.jetbrains.annotations.NotNull;
105 105 import org.jetbrains.annotations.Nullable;
106 106
107 107 /**
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 3046ffe7..fa02099c 100644
123 +index 3e044e1b4..da0ddce5d 100644
124 124 --- a/src/main/java/org/bukkit/entity/Player.java
125 125 +++ b/src/main/java/org/bukkit/entity/Player.java
126 126 @@ -2287,4 +2287,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
137 137 + @Override
138 138 + Spigot spigot();
139 139 + // Spigot end
140 140 }
141 141 diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
142 -index 1be27b04..8a01c92d 100644
142 +index 1be27b04c..8a01c92d7 100644
143 143 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
144 144 +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
145 145 @@ -113,4 +113,13 @@ public interface BookMeta extends WritableBookMeta {
146 146 @Override
147 147 @NotNull
148 148 BookMeta clone();
149 149 +
150 150 + // Spigot start
151 151 + public class Spigot {
152 152 +

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

Add shortcut