mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Upstream merge

Browse source
This commit is contained in:
Thinkofdeath 2015-02-12 14:25:18 +00:00
parent 0c2ee8bf90
commit 0e2ad96a6c
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CraftBukkit-Patches/0010-Async-Operation-Catching.patch
View file

@ -34,9 +34,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public void addEffect(MobEffect mobeffect) { public void addEffect(MobEffect mobeffect) {
+ org.spigotmc.AsyncCatcher.catchOp( "effect add"); // Spigot + org.spigotmc.AsyncCatcher.catchOp( "effect add"); // Spigot
if (this.d(mobeffect)) { // CraftBukkit start
if (this.effects.containsKey(Integer.valueOf(mobeffect.getEffectId()))) { if (isTickingEffects) {
((MobEffect) this.effects.get(Integer.valueOf(mobeffect.getEffectId()))).a(mobeffect); effectsToProcess.add(mobeffect);
diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java --- a/src/main/java/net/minecraft/server/EntityTracker.java

2
CraftBukkit-Patches/0049-Watchdog-Thread.patch
View file

@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 index 0000000000000000000000000000000000000000..00000000000000000000000000000000000000000
--- /dev/null --- /dev/null
+++ b/src/main/java/org/spigotmc/RestartCommand.java +++ b/src/main/java/org/spigotmc/RestartCommand.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@