SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1248

Browse Source 
1cff9820 PlayerElytraBoostEvent (BillyGalbreath)

* pull/1248/head:
  PlayerElytraBoostEvent

Also merged paper config into parent
This commit is contained in:
Aikar
2018-07-23 20:24:44 -04:00
parent 1ec5f04a0e 1cff982021
commit af3bd62f9e
71 changed files with 295 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Spigot-Server-Patches/Paper-config-files.patch
View File

@@ -249,7 +249,7 @@ index 000000000..e8f7b7292
+}
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
new file mode 100644
index 000000000..3d8ee9ed3
index 000000000..d5c6c37fa
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@
@@ -317,6 +317,10 @@ index 000000000..3d8ee9ed3
+ readConfig(PaperConfig.class, null);
+ }
+
+ protected static void logError(String s) {
+ Bukkit.getLogger().severe(s);
+ }
+
+ protected static void log(String s) {
+ if (verbose) {
+ Bukkit.getLogger().info(s);
@@ -428,7 +432,7 @@ index 000000000..3d8ee9ed3
+}
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
new file mode 100644
index 000000000..621bf7051
index 000000000..b8a6161d8
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -0,0 +0,0 @@
@@ -441,6 +445,7 @@ index 000000000..621bf7051
+import org.spigotmc.SpigotWorldConfig;
+
+import static com.destroystokyo.paper.PaperConfig.log;
+import static com.destroystokyo.paper.PaperConfig.logError;
+
+public class PaperWorldConfig {
+
@@ -514,7 +519,7 @@ index 5ff1e9686..3706e44a3 100644
DedicatedServer.LOGGER.info("Generating keypair");
this.a(MinecraftEncryption.b());
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 5046ecb3b..3fa32228b 100644
index 47fd48399..29c7043c8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {