OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rebuild patches for updates.

Browse source
This commit is contained in:
md_5 2015-07-12 19:59:20 +10:00
parent 84c55fb710
commit 048aee04d3
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch
View file

@ -25,12 +25,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} else if (itemstack1.count + itemstack.count > itemstack1.getMaxStackSize()) { } else if (itemstack1.count + itemstack.count > itemstack1.getMaxStackSize()) {
return false; return false;
} else { } else {
- if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemMergeEvent(this, entityitem).isCancelled()) return false; // CraftBukkit
- itemstack1.count += itemstack.count; - itemstack1.count += itemstack.count;
- entityitem.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay); - entityitem.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay);
- entityitem.age = Math.min(entityitem.age, this.age); - entityitem.age = Math.min(entityitem.age, this.age);
- entityitem.setItemStack(itemstack1); - entityitem.setItemStack(itemstack1);
- this.die(); - this.die();
+ // Spigot start + // Spigot start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callItemMergeEvent(entityitem, this).isCancelled()) return false; // CraftBukkit
+ itemstack.count += itemstack1.count; + itemstack.count += itemstack1.count;
+ this.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay); + this.pickupDelay = Math.max(entityitem.pickupDelay, this.pickupDelay);
+ this.age = Math.min(entityitem.age, this.age); + this.age = Math.min(entityitem.age, this.age);

10
CraftBukkit-Patches/0011-Spigot-Timings.patch
View file

@ -245,14 +245,14 @@ diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ import joptsimple.OptionSet; @@ -0,0 +0,0 @@ import jline.console.ConsoleReader;
import joptsimple.OptionSet;
import org.bukkit.craftbukkit.Main; import org.bukkit.craftbukkit.Main;
import org.bukkit.World.Environment;
+import org.bukkit.craftbukkit.SpigotTimings; // Spigot +import org.bukkit.craftbukkit.SpigotTimings; // Spigot
import org.bukkit.craftbukkit.util.Waitable; // CraftBukkit end
import org.bukkit.event.server.RemoteServerCommandEvent;
import org.bukkit.event.world.WorldSaveEvent; public abstract class MinecraftServer implements Runnable, ICommandListener, IAsyncTaskHandler, IMojangStatistics {
@@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
protected void z() {} protected void z() {}

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

@ -314,5 +314,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+} +}
-- --
1.9.0.msysgit.0

2
CraftBukkit-Patches/0057-Configurable-Amount-of-Netty-Threads.patch
View file

@ -53,5 +53,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
} }
-- --
1.9.0.msysgit.0