mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-31 20:22:05 -07:00
Update upstream B/CB/S
This commit is contained in:
@@ -2932,7 +2932,7 @@ index 00000000..3a288d2a
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index ab3f6c0b..e1898343 100644
|
||||
index 5649aaf7..b7c939a2 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -0,0 +0,0 @@ public final class Bukkit {
|
||||
@@ -2944,11 +2944,11 @@ index ab3f6c0b..e1898343 100644
|
||||
|
||||
/**
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index d3fdd638..30b99241 100644
|
||||
index 7a08fd1e..7dd895a0 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
|
||||
|
||||
// Spigot start
|
||||
public class Spigot
|
||||
{
|
||||
-
|
||||
@@ -3054,7 +3054,7 @@ index 3f07d7f4..f89ad075 100644
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
|
||||
new file mode 100644
|
||||
index 00000000..66232339
|
||||
index 00000000..5527e7c8
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
|
||||
@@ -0,0 +0,0 @@
|
||||
@@ -3156,6 +3156,12 @@ index 00000000..66232339
|
||||
+ default Set<PermissionAttachmentInfo> getEffectivePermissions() {
|
||||
+ throw new NotImplementedException();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ default Spigot spigot() {
|
||||
+ throw new NotImplementedException();
|
||||
+ }
|
||||
+
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
index cdf838eb..39b275cb 100644
|
||||
@@ -3451,7 +3457,7 @@ index a8f61f2d..00000000
|
||||
- // Spigot end
|
||||
-}
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index b57c81c1..d24ef805 100644
|
||||
index 9764caa4..266181aa 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||
@@ -3465,7 +3471,7 @@ index b57c81c1..d24ef805 100644
|
||||
+ }
|
||||
}
|
||||
|
||||
Spigot spigot();
|
||||
@Override
|
||||
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
index e13d27d2..b43ffd36 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
|
Reference in New Issue
Block a user