Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-29 23:17:44 +02:00
Code Issues Projects Releases Wiki Activity

Update upstream B/CB/S

Browse Source
This commit is contained in:
Zach Brown 2016-07-30 18:02:34 -05:00
parent c62efac3eb
commit 46bfd418a8
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
9 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From e5b3390ab5419f3585ef52c28b50153a75da9bed Mon Sep 17 00:00:00 2001
From 66c42230687e40a584225b2a7a1daf0857ab84de 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
@ -2964,10 +2964,10 @@ index 3f07d7f..f89ad07 100644
return i >= j && i <= k;
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index f180da0..594deb9 100644
index e2fc282..66385c4 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 {
@@ -30,7 +30,7 @@ public class SimpleCommandMap implements CommandMap {
register("bukkit", new VersionCommand("version"));
register("bukkit", new ReloadCommand("reload"));
register("bukkit", new PluginsCommand("plugins"));
@ -2976,7 +2976,7 @@ index f180da0..594deb9 100644
}
public void setFallbackCommands() {
@@ -60,6 +60,7 @@ public class SimpleCommandMap implements CommandMap {
@@ -59,6 +59,7 @@ public class SimpleCommandMap implements CommandMap {
* {@inheritDoc}
*/
public boolean register(String label, String fallbackPrefix, Command command) {
@ -2984,7 +2984,7 @@ index f180da0..594deb9 100644
label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
boolean registered = register(label, command, false, fallbackPrefix);
@@ -135,6 +136,12 @@ public class SimpleCommandMap implements CommandMap {
@@ -134,6 +135,12 @@ public class SimpleCommandMap implements CommandMap {
return false;
}
@ -3635,5 +3635,5 @@ index 8d98297..7e89b97 100644
- }
}
--
2.9.0
2.9.2.windows.1

4
Spigot-API-Patches/0005-Add-getTPS-method.patch
View File

@ -1,4 +1,4 @@
From f41ba48d012b47e2ea11fae6e58e595e93ba47e1 Mon Sep 17 00:00:00 2001
From 5c2caa3ee27bbd84914df4a001cfb7bcb528b3a2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 17:24:57 -0600
Subject: [PATCH] Add getTPS method
@ -42,5 +42,5 @@ index f82cbaf..6e23b0c 100644
* @return the unsafe values instance
*/
--
2.8.0
2.9.2.windows.1

12
Spigot-API-Patches/0013-Add-Location-support-to-tab-completers-vanilla-featu.patch
View File

@ -1,4 +1,4 @@
From d024a66976d1c5f34c53e0f9a244b9686e8f11a9 Mon Sep 17 00:00:00 2001
From 18a7c61b49b65c2a682a9b8274e0d81e11975cae Mon Sep 17 00:00:00 2001
From: DemonWav <demonwav@gmail.com>
Date: Mon, 29 Feb 2016 19:37:41 -0600
Subject: [PATCH] Add Location support to tab completers (vanilla feature
@ -99,10 +99,10 @@ index 3bfa31f..9b93872 100644
@Override
public String toString() {
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index d1a047a..fc5bc77 100644
index 66385c4..ba4d45c 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -12,6 +12,7 @@ import java.util.Map;
@@ -11,6 +11,7 @@ import java.util.Map;
import java.util.regex.Pattern;
import org.apache.commons.lang.Validate;
@ -110,7 +110,7 @@ index d1a047a..fc5bc77 100644
import org.bukkit.Server;
import org.bukkit.command.defaults.*;
import org.bukkit.entity.Player;
@@ -173,6 +174,14 @@ public class SimpleCommandMap implements CommandMap {
@@ -172,6 +173,14 @@ public class SimpleCommandMap implements CommandMap {
}
public List<String> tabComplete(CommandSender sender, String cmdLine) {
@ -125,7 +125,7 @@ index d1a047a..fc5bc77 100644
Validate.notNull(sender, "Sender cannot be null");
Validate.notNull(cmdLine, "Command line cannot null");
@@ -217,13 +226,14 @@ public class SimpleCommandMap implements CommandMap {
@@ -216,13 +225,14 @@ public class SimpleCommandMap implements CommandMap {
String[] args = PATTERN_ON_SPACE.split(argLine, -1);
try {
@ -165,5 +165,5 @@ index 6d61e3a..85b10e5 100644
+ // Paper end
}
--
2.8.2
2.9.2.windows.1

14
Spigot-API-Patches/0019-Add-exception-reporting-event.patch
View File

@ -1,4 +1,4 @@
From 971a2074ef245da993d3833bc30996d71364db96 Mon Sep 17 00:00:00 2001
From 0a66e97d6b38306199e8b76d2459c3a53beff3c5 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:24:35 -0600
Subject: [PATCH] Add exception reporting event
@ -458,10 +458,10 @@ index 0000000..5582999
+ }
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index fc5bc77..3a7b4b6 100644
index ba4d45c..8e70b43 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -11,6 +11,9 @@ import java.util.List;
@@ -10,6 +10,9 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
@ -471,7 +471,7 @@ index fc5bc77..3a7b4b6 100644
import org.apache.commons.lang.Validate;
import org.bukkit.Location;
import org.bukkit.Server;
@@ -153,7 +156,9 @@ public class SimpleCommandMap implements CommandMap {
@@ -152,7 +155,9 @@ public class SimpleCommandMap implements CommandMap {
throw ex;
} catch (Throwable ex) {
target.timings.stopTiming(); // Spigot
@ -482,7 +482,7 @@ index fc5bc77..3a7b4b6 100644
}
// return true as command was handled
@@ -230,7 +235,9 @@ public class SimpleCommandMap implements CommandMap {
@@ -229,7 +234,9 @@ public class SimpleCommandMap implements CommandMap {
} catch (CommandException ex) {
throw ex;
} catch (Throwable ex) {
@ -494,7 +494,7 @@ index fc5bc77..3a7b4b6 100644
}
// Paper end
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 1325b03..49f5872 100644
index 4ee123e..1302773 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -18,6 +18,9 @@ import java.util.logging.Level;
@ -587,5 +587,5 @@ index 1325b03..49f5872 100644
}
}
--
2.8.2
2.9.2.windows.1

8
Spigot-Server-Patches/0061-Be-a-bit-more-informative-in-maxHealth-exception.patch
View File

@ -1,11 +1,11 @@
From 141983dc1c88235f76dd597e6e4f971103992b15 Mon Sep 17 00:00:00 2001
From 37ad3a919da6d26ad26533012762804c0c852000 Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Thu, 3 Mar 2016 02:18:39 -0600
Subject: [PATCH] Be a bit more informative in maxHealth exception
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index e662e4a..f13ca63 100644
index feef438..5b7eae5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -92,7 +92,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@ -19,7 +19,7 @@ index e662e4a..f13ca63 100644
+ + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
}
if (entity instanceof EntityPlayer && health == 0) {
if (health == 0) {
--
2.9.0
2.9.2.windows.1

15
Spigot-Server-Patches/0087-Set-health-before-death-event.patch
View File

@ -1,4 +1,4 @@
From 1f03283a0c21e6511450ed1dc5fe9617b8c22787 Mon Sep 17 00:00:00 2001
From 64d014a384f05fcf4128d9ea5cbad530cf68f171 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Sun, 19 Jul 2015 16:51:38 -0400
Subject: [PATCH] Set health before death event
@ -19,10 +19,10 @@ index 2e17397..f0f8cb2 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 16da1c9..b1e63f0 100644
index ff17545..7fdd89f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -98,11 +98,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -98,11 +98,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+ (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
}
@ -30,10 +30,9 @@ index 16da1c9..b1e63f0 100644
+ if (com.destroystokyo.paper.PaperConfig.setHealthBeforeDeathEvent) {
+ this.getHandle().setHealth((float) health);
+ }
+ // Paper end
+
if (entity instanceof EntityPlayer && health == 0) {
((EntityPlayer) entity).die(DamageSource.GENERIC);
+
if (health == 0) {
getHandle().die(DamageSource.GENERIC);
}
- getHandle().setHealth((float) health);
@ -46,5 +45,5 @@ index 16da1c9..b1e63f0 100644
public double getMaxHealth() {
--
2.9.0
2.9.2.windows.1

2
work/Bukkit

@ -1 +1 @@
Subproject commit c5354dfc2689616b92a74feea44b7fa5ce3238ee
Subproject commit 9335c0ba4cba58315c014ec460f734f180ab571d

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 21e3b055225dade6100342632f059509ca638c2a
Subproject commit 83a9dbdef609f7e8dfd4c0a5758be72fe732d8c9

2
work/Spigot

@ -1 +1 @@
Subproject commit 078e2f8b3c4d46cfc88cef5a0818891aeca78a2e
Subproject commit 90f61bc448cdf47982cbeadcad280f229fe10b24