Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 10:35:38 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream B/CB

Browse Source
This commit is contained in:
Zach Brown 2017-03-31 23:24:42 -05:00
parent e6a7d357ce
commit e4a071f6e4
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
21 changed files with 117 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Spigot-API-Patches/0003-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From 6591bfa4e3eae377117aedd3105c793e13a268a9 Mon Sep 17 00:00:00 2001
From ecdb1d39c4e927e1084293c7d1a90a3eec22a1ea Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2
@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
new file mode 100644
index 0000000..4d8b633
index 00000000..4d8b633e
--- /dev/null
+++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
@@ -0,0 +1,82 @@
@ -94,7 +94,7 @@ index 0000000..4d8b633
+}
diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
new file mode 100644
index 0000000..8c43e20
index 00000000..8c43e206
--- /dev/null
+++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
@@ -0,0 +1,61 @@
@ -161,7 +161,7 @@ index 0000000..8c43e20
+}
diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
new file mode 100644
index 0000000..96057fc
index 00000000..96057fc7
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
@@ -0,0 +1,81 @@
@ -248,7 +248,7 @@ index 0000000..96057fc
+}
diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
new file mode 100644
index 0000000..8b2d1b8
index 00000000..8b2d1b82
--- /dev/null
+++ b/src/main/java/co/aikar/timings/Timing.java
@@ -0,0 +1,72 @@
@ -326,7 +326,7 @@ index 0000000..8b2d1b8
+}
diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java
new file mode 100644
index 0000000..f222d6b
index 00000000..f222d6b7
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingData.java
@@ -0,0 +1,120 @@
@ -452,7 +452,7 @@ index 0000000..f222d6b
+}
diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
new file mode 100644
index 0000000..916b6f9
index 00000000..916b6f9d
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingHandler.java
@@ -0,0 +1,209 @@
@ -667,7 +667,7 @@ index 0000000..916b6f9
+}
diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
new file mode 100644
index 0000000..389875b
index 00000000..389875b3
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingHistory.java
@@ -0,0 +1,342 @@
@ -1015,7 +1015,7 @@ index 0000000..389875b
+}
diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
new file mode 100644
index 0000000..0e114eb
index 00000000..0e114eb3
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
@@ -0,0 +1,55 @@
@ -1076,7 +1076,7 @@ index 0000000..0e114eb
+}
diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java
new file mode 100644
index 0000000..623dda4
index 00000000..623dda49
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
@@ -0,0 +1,102 @@
@ -1184,7 +1184,7 @@ index 0000000..623dda4
+}
diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
new file mode 100644
index 0000000..0571c9e
index 00000000..0571c9e7
--- /dev/null
+++ b/src/main/java/co/aikar/timings/Timings.java
@@ -0,0 +1,284 @@
@ -1474,7 +1474,7 @@ index 0000000..0571c9e
+}
diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
new file mode 100644
index 0000000..56b10e8
index 00000000..56b10e89
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsCommand.java
@@ -0,0 +1,119 @@
@ -1599,7 +1599,7 @@ index 0000000..56b10e8
+}
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
new file mode 100644
index 0000000..df7f425
index 00000000..df7f4259
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -0,0 +1,342 @@
@ -1947,7 +1947,7 @@ index 0000000..df7f425
+}
diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
new file mode 100644
index 0000000..58ed35e
index 00000000..58ed35e0
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsManager.java
@@ -0,0 +1,196 @@
@ -2149,7 +2149,7 @@ index 0000000..58ed35e
+}
diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
new file mode 100644
index 0000000..e7c389c
index 00000000..e7c389c0
--- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
@@ -0,0 +1,72 @@
@ -2227,7 +2227,7 @@ index 0000000..e7c389c
+}
diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
new file mode 100644
index 0000000..5edaba1
index 00000000..5edaba12
--- /dev/null
+++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
@@ -0,0 +1,51 @@
@ -2284,7 +2284,7 @@ index 0000000..5edaba1
+}
diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
new file mode 100644
index 0000000..5fdf7c4
index 00000000..5fdf7c4c
--- /dev/null
+++ b/src/main/java/co/aikar/util/JSONUtil.java
@@ -0,0 +1,123 @@
@ -2413,7 +2413,7 @@ index 0000000..5fdf7c4
+}
diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java
new file mode 100644
index 0000000..79fa9d5
index 00000000..79fa9d52
--- /dev/null
+++ b/src/main/java/co/aikar/util/LoadingIntMap.java
@@ -0,0 +1,70 @@
@ -2489,7 +2489,7 @@ index 0000000..79fa9d5
+}
diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
new file mode 100644
index 0000000..a9f2919
index 00000000..a9f29199
--- /dev/null
+++ b/src/main/java/co/aikar/util/LoadingMap.java
@@ -0,0 +1,332 @@
@ -2827,7 +2827,7 @@ index 0000000..a9f2919
+}
diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java
new file mode 100644
index 0000000..3a288d2
index 00000000..3a288d2a
--- /dev/null
+++ b/src/main/java/co/aikar/util/MRUMapCache.java
@@ -0,0 +1,100 @@
@ -2932,7 +2932,7 @@ index 0000000..3a288d2
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5b6413b..7fd544e 100644
index 5b6413be..7fd544eb 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -538,7 +538,6 @@ public final class Bukkit {
@ -2944,7 +2944,7 @@ index 5b6413b..7fd544e 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 120dba2..77cfe56 100644
index 120dba25..77cfe561 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -943,12 +943,27 @@ public interface Server extends PluginMessageRecipient {
@ -2978,7 +2978,7 @@ index 120dba2..77cfe56 100644
*
diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
new file mode 100644
index 0000000..fd452bc
index 00000000..fd452bce
--- /dev/null
+++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
@@ -0,0 +1,18 @@
@ -3001,7 +3001,7 @@ index 0000000..fd452bc
+ }
+}
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index 08a9739..347d218 100644
index 08a9739f..347d2189 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -32,7 +32,8 @@ public abstract class Command {
@ -3031,7 +3031,7 @@ index 08a9739..347d218 100644
return true;
}
diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
index 3f07d7f..f89ad07 100644
index 3f07d7f4..f89ad075 100644
--- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
+++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
@@ -14,6 +14,7 @@ public class FormattedCommandAlias extends Command {
@ -3054,7 +3054,7 @@ index 3f07d7f..f89ad07 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 0000000..6623233
index 00000000..66232339
--- /dev/null
+++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
@@ -0,0 +1,99 @@
@ -3158,7 +3158,7 @@ index 0000000..6623233
+ }
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 5965514..466757b 100644
index 5965514a..466757b9 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap {
@ -3193,7 +3193,7 @@ index 5965514..466757b 100644
// Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
deleted file mode 100644
index a8f61f2..0000000
index a8f61f2d..00000000
--- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
+++ /dev/null
@@ -1,253 +0,0 @@
@ -3451,10 +3451,10 @@ index a8f61f2..0000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9ce3a5e..ee88f26 100644
index 0794688e..517e69f8 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1491,6 +1491,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1497,6 +1497,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
@ -3467,7 +3467,7 @@ index 9ce3a5e..ee88f26 100644
Spigot spigot();
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 1056186..4ee123e 100644
index 10561864..4ee123e4 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -295,7 +295,6 @@ public final class SimplePluginManager implements PluginManager {
@ -3524,7 +3524,7 @@ index 1056186..4ee123e 100644
}
}
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 80c6a72..759c461 100644
index 80c6a72e..759c4617 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -40,7 +40,6 @@ import org.bukkit.plugin.PluginLoader;
@ -3573,7 +3573,7 @@ index 80c6a72..759c461 100644
eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
} else {
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index 4cffa13..b2cbf9e 100644
index 4cffa137..b2cbf9e4 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -15,7 +15,8 @@ import org.bukkit.plugin.PluginDescriptionFile;
@ -3587,7 +3587,7 @@ index 4cffa13..b2cbf9e 100644
private final Map<String, Class<?>> classes = new java.util.concurrent.ConcurrentHashMap<String, Class<?>>(); // Spigot
private final PluginDescriptionFile description;
diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
index 5ca863b..0480470 100644
index 5ca863b3..04804706 100644
--- a/src/main/java/org/bukkit/util/CachedServerIcon.java
+++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
@@ -12,4 +12,6 @@ import org.bukkit.event.server.ServerListPingEvent;
@ -3599,7 +3599,7 @@ index 5ca863b..0480470 100644
+ public String getData(); // Spigot
+}
diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
index 8d98297..7e89b97 100644
index 8d982974..7e89b97b 100644
--- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
+++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
@@ -1,165 +1,76 @@
@ -3829,5 +3829,5 @@ index 8d98297..7e89b97 100644
- }
}
--
2.9.3
2.12.1.windows.1

8
Spigot-API-Patches/0004-Player-affects-spawning-API.patch
View File

@ -1,14 +1,14 @@
From 018db8157353aedb75b2ee059924eff54229fbaa Mon Sep 17 00:00:00 2001
From 1419e3a2f80a01da0b33d85c86e5f8c083b39caf Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Mon, 29 Feb 2016 17:22:34 -0600
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index ee88f26..98d3520 100644
index 517e69f8..2f80d248 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1380,6 +1380,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1386,6 +1386,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@ -30,5 +30,5 @@ index ee88f26..98d3520 100644
public class Spigot extends Entity.Spigot
{
--
2.9.3
2.12.1.windows.1

8
Spigot-API-Patches/0010-Add-player-view-distance-API.patch
View File

@ -1,14 +1,14 @@
From 9c22321ff1ec4a12a4d82957cc689f8493cb99cc Mon Sep 17 00:00:00 2001
From 2a3d777598efa11b8b38880a86e1e42fb9d5d700 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Mon, 29 Feb 2016 18:05:37 -0600
Subject: [PATCH] Add player view distance API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 98d3520..845fa88 100644
index 2f80d248..268dc2ed 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1394,6 +1394,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1400,6 +1400,20 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setAffectsSpawning(boolean affects);
@ -30,5 +30,5 @@ index 98d3520..845fa88 100644
public class Spigot extends Entity.Spigot
{
--
2.9.3
2.12.1.windows.1

12
Spigot-API-Patches/0022-Complete-resource-pack-API.patch
View File

@ -1,14 +1,14 @@
From 80c9067e28d8125c8fb63cf7442b3c2965ff29ea Mon Sep 17 00:00:00 2001
From c8b196c93809d7a6d76c6f2fa80dd55151ca7403 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 22:59:54 -0400
Subject: [PATCH] Complete resource pack API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 46353e4..08a05f5 100644
index d89cd07c..a0b95550 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1171,7 +1171,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1177,7 +1177,9 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
* @throws IllegalArgumentException Thrown if the URL is null.
* @throws IllegalArgumentException Thrown if the URL is too long. The
* length restriction is an implementation specific arbitrary value.
@ -18,7 +18,7 @@ index 46353e4..08a05f5 100644
public void setResourcePack(String url);
/**
@@ -1551,6 +1553,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1557,6 +1559,57 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
*/
public void setViewDistance(int viewDistance);
@ -77,7 +77,7 @@ index 46353e4..08a05f5 100644
public class Spigot extends Entity.Spigot
{
diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
index 4c49801..4c83851 100644
index 4c498016..4c838519 100644
--- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
@@ -10,13 +10,28 @@ import org.bukkit.event.HandlerList;
@ -110,5 +110,5 @@ index 4c49801..4c83851 100644
* Gets the status of this pack.
*
--
2.9.3
2.12.1.windows.1

10
Spigot-API-Patches/0043-Add-String-based-Action-Bar-API.patch
View File

@ -1,11 +1,11 @@
From e4ec5de4fd5d705722e0927a63201271ace12877 Mon Sep 17 00:00:00 2001
From d6bb5c03434b922e1743da728186da22bc0786fe Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 20 Dec 2016 15:55:55 -0500
Subject: [PATCH] Add String based Action Bar API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 08a05f5..29a8ec0 100644
index a0b95550..2c166a8c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -393,6 +393,26 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@ -47,7 +47,7 @@ index 08a05f5..29a8ec0 100644
public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
spigot().sendMessage(position, components);
}
@@ -1699,9 +1721,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1705,9 +1727,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Sends the component to the specified screen position of this player
*
@ -59,7 +59,7 @@ index 08a05f5..29a8ec0 100644
public void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent component) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -1709,9 +1733,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
@@ -1715,9 +1739,11 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
/**
* Sends an array of components as a single message to the specified screen position of this player
*
@ -73,5 +73,5 @@ index 08a05f5..29a8ec0 100644
throw new UnsupportedOperationException("Not supported yet.");
}
--
2.9.3
2.12.1.windows.1

8
Spigot-Server-Patches/0006-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From b2b5b98b2f544ee0afcceab0224a86eb75055b84 Mon Sep 17 00:00:00 2001
From a6a0156f385f0432bbc34afd2126d95247cccd75 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2
@ -1663,7 +1663,7 @@ index 3a95b4465..b5efb9c3f 100644
public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a2811832e..9f452043f 100644
index 5ceb086e5..b56ae7a36 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -39,15 +39,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@ -1683,7 +1683,7 @@ index a2811832e..9f452043f 100644
import org.bukkit.craftbukkit.map.CraftMapView;
import org.bukkit.craftbukkit.map.RenderData;
import org.bukkit.craftbukkit.scoreboard.CraftScoreboard;
@@ -1606,6 +1600,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1595,6 +1589,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
packet.components = components;
getHandle().playerConnection.sendPacket(packet);
}
@ -1929,5 +1929,5 @@ index c32d44df0..5c2fb0058 100644
}
}
--
2.12.0.windows.1
2.12.1.windows.1

8
Spigot-Server-Patches/0017-Player-affects-spawning-API.patch
View File

@ -1,4 +1,4 @@
From 18f6ba2999aa3d3d8175d9d660753847446cb5bf Mon Sep 17 00:00:00 2001
From 04d76606600ef86808b56ab272b3bc6349211a9e Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 1 Mar 2016 14:47:52 -0600
Subject: [PATCH] Player affects spawning API
@ -70,10 +70,10 @@ index edd6c3b5e..751fc01d1 100644
if (d3 < 0.0D || d4 < d3 * d3) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 9f452043f..b412bf653 100644
index b56ae7a36..6509df573 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1469,6 +1469,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
@ -91,5 +91,5 @@ index 9f452043f..b412bf653 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.12.0.windows.1
2.12.1.windows.1

8
Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch
View File

@ -1,14 +1,14 @@
From cf54a9e536799481ce0827ac26a2b10ef6f2b4f9 Mon Sep 17 00:00:00 2001
From b3d1c2d9a1d5bf7b73627520a8887224643a0feb Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 23:12:03 -0600
Subject: [PATCH] Only refresh abilities if needed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b412bf653..65aca0091 100644
index 6509df573..87ac74420 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1185,12 +1185,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1174,12 +1174,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setFlying(boolean value) {
@ -24,5 +24,5 @@ index b412bf653..65aca0091 100644
@Override
--
2.12.0.windows.1
2.12.1.windows.1

8
Spigot-Server-Patches/0030-Configurable-end-credits.patch
View File

@ -1,4 +1,4 @@
From d40440cebea4465e17477fd5e9fbbdc815a06c4a Mon Sep 17 00:00:00 2001
From 6e48bc7be8c37a8e58e0a2731860aa4c48ce9190 Mon Sep 17 00:00:00 2001
From: DoctorDark <doctordark11@gmail.com>
Date: Wed, 16 Mar 2016 02:21:39 -0500
Subject: [PATCH] Configurable end credits
@ -20,10 +20,10 @@ index fd606ee14..c00fa83d5 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 4b9e83161..7c8c61ee8 100644
index 030a3e51c..79c9601fa 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -513,6 +513,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -515,6 +515,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
return this.world.pvpMode;
}
@ -39,7 +39,7 @@ index 4b9e83161..7c8c61ee8 100644
@Nullable
public Entity c(int i) {
if (this.isSleeping()) return this; // CraftBukkit - SPIGOT-3154
@@ -522,7 +531,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -524,7 +533,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.world.kill(this);
if (!this.viewingCredits) {
this.viewingCredits = true;

12
Spigot-Server-Patches/0037-Add-player-view-distance-API.patch
View File

@ -1,14 +1,14 @@
From a60f675dfc193a297f79e43764d1980322bb4fd4 Mon Sep 17 00:00:00 2001
From aba5e7d678803a80c6c72216a765652e920f1ea7 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 14:35:27 -0600
Subject: [PATCH] Add player view distance API
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 378057e85..485e1c3c7 100644
index 79c9601fa..1ed1859b8 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -57,6 +57,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -59,6 +59,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public boolean f;
public int ping;
public boolean viewingCredits;
@ -194,10 +194,10 @@ index 021dfba14..9012a63a0 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 65aca0091..cc26aa748 100644
index 87ac74420..16dcaba3f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1480,6 +1480,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1469,6 +1469,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().affectsSpawning;
}
@ -215,5 +215,5 @@ index 65aca0091..cc26aa748 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.12.0.windows.1
2.12.1.windows.1

10
Spigot-Server-Patches/0044-Configurable-container-update-tick-rate.patch
View File

@ -1,4 +1,4 @@
From 2e01d589aa09d046929f8d3cd70b1938c0978a3c Mon Sep 17 00:00:00 2001
From ff439bb924729825a7d8c535b306a61a4bbecb0e Mon Sep 17 00:00:00 2001
From: Sudzzy <originmc@outlook.com>
Date: Wed, 2 Mar 2016 23:34:44 -0600
Subject: [PATCH] Configurable container update tick rate
@ -19,10 +19,10 @@ index 1bb956515..e6aae7317 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 485e1c3c7..d0e1de48a 100644
index 1ed1859b8..4866f9f34 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -66,6 +66,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -68,6 +68,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.viewDistance = viewDistance;
}
// Paper end
@ -30,7 +30,7 @@ index 485e1c3c7..d0e1de48a 100644
// CraftBukkit start
public String displayName;
@@ -228,7 +229,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -230,7 +231,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
--this.noDamageTicks;
}
@ -45,5 +45,5 @@ index 485e1c3c7..d0e1de48a 100644
this.closeInventory();
this.activeContainer = this.defaultContainer;
--
2.12.0.windows.1
2.12.1.windows.1

8
Spigot-Server-Patches/0067-Complete-resource-pack-API.patch
View File

@ -1,4 +1,4 @@
From 3ff9b059851515b6222203624c8aa44b1bd73826 Mon Sep 17 00:00:00 2001
From c8f3da57d4793c642fc45ffb746e43eaa12a34a0 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sat, 4 Apr 2015 23:17:52 -0400
Subject: [PATCH] Complete resource pack API
@ -23,7 +23,7 @@ index fd2c0c4f2..e0cc33924 100644
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 68ce11be8..923f81f23 100644
index d72ff0af2..5fd5e39fa 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -74,6 +74,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -37,7 +37,7 @@ index 68ce11be8..923f81f23 100644
public CraftPlayer(CraftServer server, EntityPlayer entity) {
super(server, entity);
@@ -1571,6 +1575,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1560,6 +1564,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
}
@ -71,5 +71,5 @@ index 68ce11be8..923f81f23 100644
private final Player.Spigot spigot = new Player.Spigot()
{
--
2.12.0.windows.1
2.12.1.windows.1

8
Spigot-Server-Patches/0082-handle-NaN-health-absorb-values-and-repair-bad-data.patch
View File

@ -1,4 +1,4 @@
From 9eb7dd5d37830bc084265340fc125b0a8059e964 Mon Sep 17 00:00:00 2001
From e3b383aa29dc343314f3fd834b7b8d3ecdfe41d9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 27 Sep 2015 01:18:02 -0400
Subject: [PATCH] handle NaN health/absorb values and repair bad data
@ -44,10 +44,10 @@ index 9cb3b22fb..c70f14a15 100644
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 923f81f23..b2fe1afc0 100644
index 5fd5e39fa..80a6a0b41 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1409,6 +1409,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1398,6 +1398,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public void setRealHealth(double health) {
@ -56,5 +56,5 @@ index 923f81f23..b2fe1afc0 100644
}
--
2.12.0.windows.1
2.12.1.windows.1

12
Spigot-Server-Patches/0121-Implement-PlayerLocaleChangeEvent.patch
View File

@ -1,14 +1,14 @@
From 7c5c9f54197be368f4de6333591de92a2c03e239 Mon Sep 17 00:00:00 2001
From 60222f6b6204b0319b337d3e109d5ee56ef58b35 Mon Sep 17 00:00:00 2001
From: Isaac Moore <rmsy@me.com>
Date: Tue, 19 Apr 2016 14:09:31 -0500
Subject: [PATCH] Implement PlayerLocaleChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 7ec504730..cfdff768f 100644
index 4866f9f34..cf12e51e4 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -29,7 +29,7 @@ import org.bukkit.inventory.MainHand;
@@ -31,7 +31,7 @@ import org.bukkit.inventory.MainHand;
public class EntityPlayer extends EntityHuman implements ICrafting {
private static final Logger bR = LogManager.getLogger();
@ -17,7 +17,7 @@ index 7ec504730..cfdff768f 100644
public PlayerConnection playerConnection;
public final MinecraftServer server;
public final PlayerInteractManager playerInteractManager;
@@ -1093,7 +1093,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1104,7 +1104,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.server.server.getPluginManager().callEvent(event);
}
// CraftBukkit end
@ -34,10 +34,10 @@ index 7ec504730..cfdff768f 100644
this.ch = packetplayinsettings.d();
this.getDataWatcher().set(EntityPlayer.bq, Byte.valueOf((byte) packetplayinsettings.e()));
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a74d6c768..a2fb7d2be 100644
index 5f6b182d6..233903b5f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1702,7 +1702,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1691,7 +1691,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public String getLocale()
{

6
Spigot-Server-Patches/0152-Re-track-players-that-dismount-from-other-players.patch
View File

@ -1,14 +1,14 @@
From 88f7bde20a7c6a5478b3a64d5761543945318e41 Mon Sep 17 00:00:00 2001
From 4627eeb7a8f7e6c42eb3821f246044308c526c37 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 31 Jul 2016 16:33:03 -0500
Subject: [PATCH] Re-track players that dismount from other players
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index cfdff768f..5753f5b97 100644
index cf12e51e4..acda1843d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -651,6 +651,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -653,6 +653,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
if (entity1 != entity && this.playerConnection != null) {
this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
}

8
Spigot-Server-Patches/0159-Auto-Save-Improvements.patch
View File

@ -1,4 +1,4 @@
From 4901fdc6a2e285bd3c2e11164ece8b2c660ca26c Mon Sep 17 00:00:00 2001
From 7c3a25fe8d6cc4957b83df04789ebe3265f2dc7f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 19 Sep 2016 23:16:39 -0400
Subject: [PATCH] Auto Save Improvements
@ -96,10 +96,10 @@ index 0a8e09e5e..ad668be62 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 93c4babd9..0cd350254 100644
index acda1843d..171ed25c3 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -30,6 +30,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -32,6 +32,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
private static final Logger bR = LogManager.getLogger();
public String locale = null; // Spigot private -> public // Paper - default to null
@ -215,5 +215,5 @@ index f969d2a72..cc0e8d2c8 100644
timings.worldSaveChunks.startTiming(); // Paper
chunkproviderserver.a(flag);
--
2.12.0.windows.1
2.12.1.windows.1

8
Spigot-Server-Patches/0162-Auto-fix-bad-Y-levels-on-player-login.patch
View File

@ -1,4 +1,4 @@
From 992ba8eacd10adf4e6ba33bbd2d17a70c9c02b24 Mon Sep 17 00:00:00 2001
From bf0f03262b6ac784f59f36362f0ecd0d32ef1388 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 21 Sep 2016 23:48:39 -0400
Subject: [PATCH] Auto fix bad Y levels on player login
@ -6,10 +6,10 @@ Subject: [PATCH] Auto fix bad Y levels on player login
Bring down to a saner Y level if super high, as this can cause the server to crash
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 0cd350254..4da83a1bf 100644
index 171ed25c3..32bce920b 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -128,6 +128,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -130,6 +130,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
}
@ -18,5 +18,5 @@ index 0cd350254..4da83a1bf 100644
}
--
2.12.0.windows.1
2.12.1.windows.1

10
Spigot-Server-Patches/0174-Optimise-removeQueue.patch
View File

@ -1,11 +1,11 @@
From 4b6c877be1c3f82fe7502f8be28367b47de0ef6d Mon Sep 17 00:00:00 2001
From 4430ecd04c3c11b7a8c19473114681789f915ac2 Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com>
Date: Fri, 25 Nov 2016 13:22:40 +0000
Subject: [PATCH] Optimise removeQueue
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 0d73fc4cf..ea140f715 100644
index 32bce920b..56ce2554d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@ -18,7 +18,7 @@ index 0d73fc4cf..ea140f715 100644
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -36,7 +38,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -38,7 +40,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public final PlayerInteractManager playerInteractManager;
public double d;
public double e;
@ -27,7 +27,7 @@ index 0d73fc4cf..ea140f715 100644
private final ServerStatisticManager bU;
private float bV = Float.MIN_VALUE;
private int bW = Integer.MIN_VALUE;
@@ -248,10 +250,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -250,10 +252,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
Iterator iterator = this.removeQueue.iterator();
int j = 0;
@ -46,7 +46,7 @@ index 0d73fc4cf..ea140f715 100644
this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
}
@@ -992,7 +1001,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -994,7 +1003,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
this.lastSentExp = -1;
this.lastHealthSent = -1.0F;
this.cc = -1;

6
Spigot-Server-Patches/0191-Properly-fix-item-duplication-bug.patch
View File

@ -1,4 +1,4 @@
From 45e06ece3de8a6cbb446c94ca66b8347324ea0ab Mon Sep 17 00:00:00 2001
From 2f3f6a481abc5023e04d0bb3225182beda67ae73 Mon Sep 17 00:00:00 2001
From: Alfie Cleveland <alfeh@me.com>
Date: Tue, 27 Dec 2016 01:57:57 +0000
Subject: [PATCH] Properly fix item duplication bug
@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
Credit to prplz for figuring out the real issue
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index ea140f715..7bc7991eb 100644
index 56ce2554d..a5c5bd4be 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1334,7 +1334,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1345,7 +1345,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
protected boolean isFrozen() {

2
work/Bukkit

@ -1 +1 @@
Subproject commit 7fd370c8c087679c0324e2acf91efa8751df0273
Subproject commit c0d10c54ae8f2f0a875da4c717d55c701fa5b369

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 7dd77d7340d2bcc1ebab5ab0b0b60e8fb3e0add7
Subproject commit b5f7b6d69ff20cbd36b00728de287ac21c424c9f