Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
775a764e Thread Safe Vanilla Command permission checking
This commit is contained in:
William Blake Galbreath
2020-07-11 10:43:47 -05:00
parent 714f0a04d0
commit c4f05ee8cb
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: 601356760c...775a764eca

2
current-paper
View File

@@ -1 +1 @@
1.16.1--0a9e35360868bb50344aa75df1ada180cc19e9bb
1.16.1--0df591d6c739c8dbdad5e5374bd67e93740fcc62

12
patches/server/0092-Add-ping-command.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add /ping command
diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java
index 1194f91a5..9141976d1 100644
index 1194f91a51..9141976d1d 100644
--- a/src/main/java/net/minecraft/server/ArgumentEntity.java
+++ b/src/main/java/net/minecraft/server/ArgumentEntity.java
@@ -69,10 +69,12 @@ public class ArgumentEntity implements ArgumentType<EntitySelector> {
@@ -22,7 +22,7 @@ index 1194f91a5..9141976d1 100644
List<EntityPlayer> list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource());
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
index 4ace0e79c..5e004f063 100644
index 4ace0e79c9..5e004f0635 100644
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -28,7 +28,7 @@ import org.bukkit.event.server.ServerCommandEvent;
@@ -56,10 +56,10 @@ index 4ace0e79c..5e004f063 100644
return RequiredArgumentBuilder.argument(s, argumenttype);
}
diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
index fa0f247e5..c8d53a854 100644
index a4995ddc82..e0cbe1a571 100644
--- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java
+++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java
@@ -179,6 +179,7 @@ public class CommandListenerWrapper implements ICompletionProvider, com.destroys
@@ -182,6 +182,7 @@ public class CommandListenerWrapper implements ICompletionProvider, com.destroys
}
}
@@ -68,7 +68,7 @@ index fa0f247e5..c8d53a854 100644
if (!(this.k instanceof EntityPlayer)) {
throw CommandListenerWrapper.a.create();
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index f7e5d12cf..066ae1fec 100644
index f7e5d12cfb..066ae1fecb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -132,9 +132,11 @@ public class PurpurConfig {
@@ -85,7 +85,7 @@ index f7e5d12cf..066ae1fec 100644
public static String serverModName = "Purpur";
diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java
new file mode 100644
index 000000000..f36e655cb
index 0000000000..f36e655cb8
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java
@@ -0,0 +1,37 @@