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

Rebuild patch hashes, fix build.

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-03-10 09:14:45 +11:00
parent 74b65b1d0e
commit 3985d6815c
140 changed files with 188 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0008-Merge-tweaks-and-configuration.patch
View File

@@ -1,4 +1,4 @@
From 3499d77354a84df9ce6e49d5dba39a0a471b3ff8 Mon Sep 17 00:00:00 2001
From d5dbd54e27e10e47e7efa1537a9e90d322d79762 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration
@@ -41,7 +41,7 @@ index bbcf674..08b9ac8 100644
}
} else {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 53ab411..d90d5a4 100644
index 069db6a..164d268 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -934,6 +934,23 @@ public abstract class World implements IBlockAccess {
@@ -69,7 +69,7 @@ index 53ab411..d90d5a4 100644
if (event != null && (event.isCancelled() || entity.dead)) {
entity.dead = true;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index ddca7c3..185442a 100644
index 7e79ba5..1545a61 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -110,4 +110,18 @@ public class SpigotWorldConfig