mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-08-05 16:48:51 +00:00
161 lines
4.7 KiB
Diff
161 lines
4.7 KiB
Diff
From 256736edca9a586d50fc0ede2ed503cad53eeb34 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 34cdaaf9..6a8f1c73 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -2093,4 +2093,9 @@ public final class Bukkit {
|
|
public static UnsafeValues getUnsafe() {
|
|
return server.getUnsafe();
|
|
}
|
|
+
|
|
+ @NotNull
|
|
+ public static Server.Spigot spigot() {
|
|
+ return server.spigot();
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 30e1fbae..44e527c6 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1786,4 +1786,13 @@ public interface Server extends PluginMessageRecipient {
|
|
@Deprecated
|
|
@NotNull
|
|
UnsafeValues getUnsafe();
|
|
+
|
|
+ // Spigot start
|
|
+ public class Spigot {
|
|
+
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ Spigot spigot();
|
|
+ // Spigot end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
|
index 16feb5ef..d89e047d 100644
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
+++ b/src/main/java/org/bukkit/World.java
|
|
@@ -2721,6 +2721,15 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
|
|
@Nullable
|
|
StructureSearchResult locateNearestStructure(@NotNull Location origin, @NotNull Structure structure, int radius, boolean findUnexplored);
|
|
|
|
+ // Spigot start
|
|
+ public class Spigot {
|
|
+
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ Spigot spigot();
|
|
+ // Spigot end
|
|
+
|
|
/**
|
|
* 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 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 {
|
|
*/
|
|
@NotNull
|
|
public String getName();
|
|
+
|
|
+ // Spigot start
|
|
+ public class Spigot {
|
|
+
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ Spigot spigot();
|
|
+ // Spigot end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
|
index 69ba14b6..8532b848 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -758,4 +758,14 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
|
@NotNull
|
|
@ApiStatus.Experimental
|
|
Entity copy(@NotNull Location to);
|
|
+
|
|
+ // Spigot start
|
|
+ public class Spigot extends CommandSender.Spigot {
|
|
+
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ Spigot spigot();
|
|
+ // Spigot end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
|
|
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;
|
|
|
|
import org.bukkit.GameEvent;
|
|
import org.bukkit.enchantments.Enchantment;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
import org.jetbrains.annotations.Nullable;
|
|
|
|
/**
|
|
@@ -82,4 +83,13 @@ public interface LightningStrike extends Entity {
|
|
*/
|
|
public void setCausingPlayer(@Nullable Player player);
|
|
|
|
+ // Spigot start
|
|
+ public class Spigot extends Entity.Spigot {
|
|
+
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ Spigot spigot();
|
|
+ // Spigot end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
|
index 246acd6e..2b3e490a 100644
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
|
@@ -2041,4 +2041,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
|
* @return whether the player allows server listings
|
|
*/
|
|
public boolean isAllowingServerListings();
|
|
+
|
|
+ // Spigot start
|
|
+ public class Spigot extends Entity.Spigot {
|
|
+
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ Spigot spigot();
|
|
+ // 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 d650da50..f740bebe 100644
|
|
--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
|
|
+++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
|
|
@@ -185,4 +185,13 @@ public interface BookMeta extends ItemMeta {
|
|
@Override
|
|
@NotNull
|
|
BookMeta clone();
|
|
+
|
|
+ // Spigot start
|
|
+ public class Spigot {
|
|
+
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ Spigot spigot();
|
|
+ // Spigot end
|
|
}
|
|
--
|
|
2.43.0
|
|
|