CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better nerf for TNT Cannons ...

Browse Source 
Drops the item
Applies to all Falling Block Entities
This commit is contained in:
Byteflux 2014-07-30 03:35:19 -05:00 committed by Zach Brown
parent 7d802ab493
commit aeead930a1
37 changed files with 164 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CraftBukkit-Patches/0002-mc-dev-imports.patch
View File

@ -1,4 +1,4 @@
From a615a6adb52d72e718f4d493dd4436a0a2678ff9 Mon Sep 17 00:00:00 2001
From a90b1cb99b9ac53325dddf8490e0b76efa7e9a80 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 15:10:48 +1100
Subject: [PATCH] mc-dev imports
@ -4035,3 +4035,4 @@ HcmV?d00001
--
1.9.1

3
CraftBukkit-Patches/0032-Allow-Disabling-of-Command-Logging.patch
View File

@ -1,4 +1,4 @@
From abe67ad73f7f5c0d156def0bec08583d78a823d3 Mon Sep 17 00:00:00 2001
From 3ab4c1baeb78d02656061fbac5d174d7b5aee5ff Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:01:29 +1000
Subject: [PATCH] Allow Disabling of Command Logging
@ -34,3 +34,4 @@ index 6dfa8b0..c9e6dc5 100644
}
--
1.9.1

6
CraftBukkit-Patches/0033-Allow-Disabling-of-Command-TabComplete.patch
View File

@ -1,4 +1,4 @@
From 514f81e6239b77fa8bba578144d14ac72b2bcacc Mon Sep 17 00:00:00 2001
From cfea15bce3be69955a501db1276b44232d74155d Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 18:05:54 +1000
Subject: [PATCH] Allow Disabling of Command TabComplete
@ -23,10 +23,10 @@ index 6dc4157..fdac2f6 100644
try {
completions = getCommandMap().tabComplete(player, message.substring(1));
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index a83ee05..f8427ed 100644
index c9e6dc5..f611334 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -148,4 +148,21 @@ public class SpigotConfig
@@ -154,4 +154,21 @@ public class SpigotConfig
{
logCommands = getBoolean( "commands.log", true );
}

6
CraftBukkit-Patches/0034-Configurable-Messages.patch
View File

@ -1,4 +1,4 @@
From dfa09343501f553560c194f52959f6db411eca40 Mon Sep 17 00:00:00 2001
From 8b3b97e46404c6f91c1c3f9c4632fa956b776524 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Fri, 21 Jun 2013 19:21:58 +1000
Subject: [PATCH] Configurable Messages
@ -62,7 +62,7 @@ index fdac2f6..f8e2f0f 100644
return false;
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index f8427ed..7a69092 100644
index f611334..4a89e70 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -12,6 +12,7 @@ import java.util.Map;
@ -73,7 +73,7 @@ index f8427ed..7a69092 100644
import org.bukkit.command.Command;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -165,4 +166,28 @@ public class SpigotConfig
@@ -171,4 +172,28 @@ public class SpigotConfig
}
tabComplete = getInt( "commands.tab-complete", 0 );
}

6
CraftBukkit-Patches/0055-Watchdog-Thread.patch
View File

@ -1,4 +1,4 @@
From 54c5db10983812cd799d9dd0b2367400bd312597 Mon Sep 17 00:00:00 2001
From 4fcc8840a648aae6573f9b59366b17922b1dcb7b Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Feb 2013 12:33:20 +1100
Subject: [PATCH] Watchdog Thread.
@ -155,10 +155,10 @@ index 0000000..429c258
+ }
+}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 7a69092..d7e2087 100644
index 4a89e70..069111c 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -190,4 +190,18 @@ public class SpigotConfig
@@ -196,4 +196,18 @@ public class SpigotConfig
outdatedClientMessage = transform( getString( "messages.outdated-client", outdatedClientMessage ) );
outdatedServerMessage = transform( getString( "messages.outdated-server", outdatedServerMessage ) );
}

6
CraftBukkit-Patches/0064-BungeeCord-Support.patch
View File

@ -1,4 +1,4 @@
From 4f192d0927204e80d3d24303eb382c7ef5f0f074 Mon Sep 17 00:00:00 2001
From f778234f103f8b7c09941172f010f9c43a02c9ae Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sun, 1 Dec 2013 18:18:41 +1100
Subject: [PATCH] BungeeCord Support
@ -192,10 +192,10 @@ index a77b2d9..e030666 100644
{
return getHandle().collidesWithEntities;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index d7e2087..8da7267 100644
index 069111c..7a0cb86 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -204,4 +204,14 @@ public class SpigotConfig
@@ -210,4 +210,14 @@ public class SpigotConfig
commands.put( "restart", new RestartCommand( "restart" ) );
WatchdogThread.doStart( timeoutTime, restartOnCrash );
}

6
CraftBukkit-Patches/0066-Configurable-Amount-of-Netty-Threads.patch
View File

@ -1,4 +1,4 @@
From 56eccac1d7b7a479cb9dfcae3d33a24fa51440e9 Mon Sep 17 00:00:00 2001
From 6648f843706a4d60068bc8b689af566b401ef0ee Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 13 Dec 2013 11:58:58 +1100
Subject: [PATCH] Configurable Amount of Netty Threads
@ -37,10 +37,10 @@ index 256d2f9..b0157b2 100644
public boolean ak() {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 8da7267..978dd41 100644
index 7a0cb86..59ba766 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -214,4 +214,11 @@ public class SpigotConfig
@@ -220,4 +220,11 @@ public class SpigotConfig
}
bungee = getBoolean( "settings.bungeecord", false );
}

6
CraftBukkit-Patches/0076-Add-Late-Bind-Option.patch
View File

@ -1,4 +1,4 @@
From c918263543d5c8d18cfba4623fddeb9d5c788dc4 Mon Sep 17 00:00:00 2001
From 7f5e5194bd11e6669f6b9c2e3ce1b38e85411956 Mon Sep 17 00:00:00 2001
From: slide23 <me@slide.ws>
Date: Fri, 20 Dec 2013 20:15:33 -0600
Subject: [PATCH] Add Late Bind Option
@ -43,10 +43,10 @@ index 58e68da..6ba9c8c 100644
}
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 978dd41..6ced245 100644
index 59ba766..bfe4ec4 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -221,4 +221,9 @@ public class SpigotConfig
@@ -227,4 +227,9 @@ public class SpigotConfig
System.setProperty( "io.netty.eventLoopThreads", Integer.toString( count ) );
Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count );
}

6
CraftBukkit-Patches/0077-Allow-statistics-to-be-disabled-forced.patch
View File

@ -1,4 +1,4 @@
From 42cadef542dc3d00570cb3e29976c476816ee9c8 Mon Sep 17 00:00:00 2001
From a5b5ae6423008efad34229f0d333432365d22eec Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Tue, 7 Jan 2014 15:56:26 +0000
Subject: [PATCH] Allow statistics to be disabled/forced
@ -40,7 +40,7 @@ index 57a501f..cea31ae 100644
super.setStatistic(entityhuman, statistic, i);
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6ced245..e6709a8 100644
index bfe4ec4..47ab784 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -10,10 +10,12 @@ import java.util.HashMap;
@ -56,7 +56,7 @@ index 6ced245..e6709a8 100644
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -226,4 +228,31 @@ public class SpigotConfig
@@ -232,4 +234,31 @@ public class SpigotConfig
private static void lateBind() {
lateBind = getBoolean( "settings.late-bind", false );
}

6
CraftBukkit-Patches/0087-Highly-Optimized-Tick-Loop.patch
View File

@ -1,4 +1,4 @@
From 1b7e55d8cc75cff4db39c55935996595dba412c1 Mon Sep 17 00:00:00 2001
From 660928dd4dcdd2929af3c2ea7a5f3244d3d90c0e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sat, 25 Jan 2014 14:08:35 +1100
Subject: [PATCH] Highly Optimized Tick Loop
@ -96,10 +96,10 @@ index 622e522..d6cd151 100644
this.a((CrashReport) null);
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index e6709a8..3f45433 100644
index 47ab784..2bc1a32 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -255,4 +255,9 @@ public class SpigotConfig
@@ -261,4 +261,9 @@ public class SpigotConfig
"screen." );
}
}

6
CraftBukkit-Patches/0089-Configurable-Ping-Sample-Size.patch
View File

@ -1,4 +1,4 @@
From 67e1c4618a1dabe19a00d6d33a5a5719dff6c8b1 Mon Sep 17 00:00:00 2001
From f9ee498632c0c8ebea52cee04a050647ee850f4b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 26 Jan 2014 21:48:34 +1100
Subject: [PATCH] Configurable Ping Sample Size
@ -23,10 +23,10 @@ index cd06305..6423aec 100644
ServerPing ping = new ServerPing();
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 3f45433..2c2b978 100644
index 2bc1a32..4ae5640 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -260,4 +260,11 @@ public class SpigotConfig
@@ -266,4 +266,11 @@ public class SpigotConfig
{
commands.put( "tps", new TicksPerSecondCommand( "tps" ) );
}

6
CraftBukkit-Patches/0090-Add-Optional-Tick-Shuffling.patch
View File

@ -1,4 +1,4 @@
From 24075025bc9ddb06bd66244b8fd4399406d7910a Mon Sep 17 00:00:00 2001
From 578d974237e631aa8d5da33bf196892ec67aecdd Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 27 Jan 2014 08:39:26 +1100
Subject: [PATCH] Add Optional Tick Shuffling
@ -24,10 +24,10 @@ index c2194af..1d7b814 100644
while (iterator.hasNext()) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 2c2b978..86d5aef 100644
index 4ae5640..153fb4f 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -267,4 +267,10 @@ public class SpigotConfig
@@ -273,4 +273,10 @@ public class SpigotConfig
playerSample = getInt( "settings.sample-count", 12 );
System.out.println( "Server Ping Player Sample Count: " + playerSample );
}

6
CraftBukkit-Patches/0095-Spam-Filter-Exclusions.patch
View File

@ -1,4 +1,4 @@
From 7f3bd2ea37408af90dc963034f553dd693c430d4 Mon Sep 17 00:00:00 2001
From 64793a51c1aef0c4f6e04ccbe24b319ffc2d17bb Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 8 Feb 2014 08:13:40 +0000
Subject: [PATCH] Spam Filter Exclusions
@ -30,7 +30,7 @@ index 1ee5541..79d8fe0 100644
Waitable waitable = new Waitable() {
@Override
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 86d5aef..44eea2e 100644
index 153fb4f..ff86680 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -6,6 +6,7 @@ import java.io.IOException;
@ -41,7 +41,7 @@ index 86d5aef..44eea2e 100644
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -273,4 +274,13 @@ public class SpigotConfig
@@ -279,4 +280,13 @@ public class SpigotConfig
{
playerShuffle = getInt( "settings.player-shuffle", 0 );
}

6
CraftBukkit-Patches/0096-Add-Option-to-Silence-CommandBlock-Console.patch
View File

@ -1,4 +1,4 @@
From 9415a077fbdf2ee6e336765b307c57156cc3610a Mon Sep 17 00:00:00 2001
From 83d82f5446b7d93b0295aceabe28023c93ebd648 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 9 Feb 2014 14:39:01 +1100
Subject: [PATCH] Add Option to Silence CommandBlock Console
@ -18,10 +18,10 @@ index 0644276..84bcca1 100644
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 44eea2e..6b5ee89 100644
index ff86680..731f24d 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -283,4 +283,10 @@ public class SpigotConfig
@@ -289,4 +289,10 @@ public class SpigotConfig
"/skill"
} ) );
}

6
CraftBukkit-Patches/0098-Allow-Disabling-Creative-Item-Filter.patch
View File

@ -1,4 +1,4 @@
From d417c5bd284a3d16bf52708262fd3598044dc544 Mon Sep 17 00:00:00 2001
From 36abb5407fb6a2f866b44034f04d93301b6b0285 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Wed, 12 Feb 2014 18:18:01 +1100
Subject: [PATCH] Allow Disabling Creative Item Filter
@ -18,10 +18,10 @@ index 79d8fe0..c9e99e9 100644
// CraftBukkit start - Call click event
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6b5ee89..6957c17 100644
index 731f24d..05c2e43 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -289,4 +289,10 @@ public class SpigotConfig
@@ -295,4 +295,10 @@ public class SpigotConfig
{
silentCommandBlocks = getBoolean( "commands.silent-commandblock-console", false );
}

6
CraftBukkit-Patches/0100-Allow-vanilla-commands-to-be-the-main-version-of-a-c.patch
View File

@ -1,4 +1,4 @@
From 185cb53721e2c071a2b3c062b964fb167441867e Mon Sep 17 00:00:00 2001
From 6c9d15cd9c4cb3a9ce49e30ddf3b1e06a4b42ff2 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Wed, 12 Feb 2014 20:44:14 +0000
Subject: [PATCH] Allow vanilla commands to be the main version of a command
@ -138,7 +138,7 @@ index 5a08283..a235ce8 100644
private void loadPlugin(Plugin plugin) {
try {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 6957c17..e4ee00e 100644
index 05c2e43..a299317 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -8,8 +8,10 @@ import java.lang.reflect.Method;
@ -152,7 +152,7 @@ index 6957c17..e4ee00e 100644
import java.util.logging.Level;
import net.minecraft.util.gnu.trove.map.hash.TObjectIntHashMap;
import net.minecraft.server.MinecraftServer;
@@ -295,4 +297,16 @@ public class SpigotConfig
@@ -301,4 +303,16 @@ public class SpigotConfig
{
filterCreativeItems = getBoolean( "settings.filter-creative-items", true );
}

3
CraftBukkit-Patches/0133-Convert-player-skulls-async.patch
View File

@ -1,4 +1,4 @@
From a9c0273e82c8e1ea6a93e66482b23d7b74061c0d Mon Sep 17 00:00:00 2001
From 4a519378aaf3ceca84a0e7f934e8600eb03e2c38 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sun, 20 Apr 2014 13:18:55 +0100
Subject: [PATCH] Convert player skulls async
@ -245,3 +245,4 @@ index d648d05..e32bcb1 100644
--
1.9.1

6
CraftBukkit-Patches/0138-Configurable-UserCache-cap.patch
View File

@ -1,4 +1,4 @@
From 7e0007b7cee79859c5ec5b92355e4051abe42e42 Mon Sep 17 00:00:00 2001
From d31b06968d185d3f4f03f6c90ada1480415e3aca Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Fri, 25 Apr 2014 18:17:30 -0400
Subject: [PATCH] Configurable UserCache cap
@ -18,10 +18,10 @@ index bbbcc86..4aea9df 100644
try {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index e4ee00e..2bc7333 100644
index a299317..8e4e7db 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -309,4 +309,10 @@ public class SpigotConfig
@@ -315,4 +315,10 @@ public class SpigotConfig
replaceCommands = new HashSet<String>( (List<String>) getList( "commands.replace-commands",
Arrays.asList( "setblock", "summon", "testforblock", "tellraw" ) ) );
}

6
CraftBukkit-Patches/0142-Configurable-save-on-stop-only-for-UserCache.patch
View File

@ -1,4 +1,4 @@
From 0ef2e0db62622ffe66866c9629d7a627b2276371 Mon Sep 17 00:00:00 2001
From 9cdc944a0cb40b8d53cd12d948db27c4fa569ef2 Mon Sep 17 00:00:00 2001
From: drXor <mcyoungsota@gmail.com>
Date: Fri, 23 May 2014 18:05:10 -0400
Subject: [PATCH] Configurable save-on-stop-only for UserCache
@ -36,10 +36,10 @@ index 4aea9df..9f7de3f 100644
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 2bc7333..00b7cad 100644
index 8e4e7db..46c8573 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -315,4 +315,10 @@ public class SpigotConfig
@@ -321,4 +321,10 @@ public class SpigotConfig
{
userCacheCap = getInt( "settings.user-cache-size", 1000 );
}

6
CraftBukkit-Patches/0143-Prevent-Unbounded-IntCache-Growth.patch
View File

@ -1,4 +1,4 @@
From 29560010d8f7d2333647671b313fb2a55085df36 Mon Sep 17 00:00:00 2001
From fc0bdcd14ce8e649c564e34505da292481d4d83b Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 20 Jun 2014 19:40:00 +1000
Subject: [PATCH] Prevent Unbounded IntCache Growth
@ -43,10 +43,10 @@ index 9858720..47e06df 100644
}
}
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 00b7cad..7998aac 100644
index 46c8573..429ad36 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -321,4 +321,10 @@ public class SpigotConfig
@@ -327,4 +327,10 @@ public class SpigotConfig
{
saveUserCacheOnStopOnly = getBoolean( "settings.save-user-cache-on-stop-only", false );
}

6
CraftBukkit-Patches/0150-Further-Seed-Customisation.patch
View File

@ -1,4 +1,4 @@
From 2c7348988b9714bd0a220946e62a03ba8f5944ef Mon Sep 17 00:00:00 2001
From 3f3c4ec60f21c86d747c10a53520497368337835 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 4 Jul 2014 13:28:45 +1000
Subject: [PATCH] Further Seed Customisation
@ -32,10 +32,10 @@ index 7ca18a1..8d1721a 100644
i1 *= this.g;
j1 *= this.g;
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index a81b7c9..fd79b25 100644
index 3e6b1e6..2073732 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -317,4 +317,13 @@ public class SpigotWorldConfig
@@ -292,4 +292,13 @@ public class SpigotWorldConfig
{
witherSpawnSoundRadius = getInt( "wither-spawn-sound-radius", 0 );
}

6
CraftBukkit-Patches/0158-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch
View File

@ -1,11 +1,11 @@
From ad8430edf44f21bd3d33b746962a019be888c20d Mon Sep 17 00:00:00 2001
From 64ca139b248f73d33d65f10cc86b3f5807d37018 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Sat, 19 Jul 2014 12:49:48 +0100
Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index 1f15e40..8abbcdf 100644
index aba3748..22aac7b 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -2,6 +2,7 @@ package net.minecraft.server;
@ -16,7 +16,7 @@ index 1f15e40..8abbcdf 100644
private PathfinderGoalTempt bq;
public EntityOcelot(World world) {
@@ -238,7 +239,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@@ -213,7 +214,7 @@ public class EntityOcelot extends EntityTameableAnimal {
public GroupDataEntity prepare(GroupDataEntity groupdataentity) {
groupdataentity = super.prepare(groupdataentity);

3
CraftBukkit-Patches/0161-Make-moved-wrongly-limit-configurable.patch
View File

@ -1,4 +1,4 @@
From 71ccfcaea97281da32267e9e77f7c170912da742 Mon Sep 17 00:00:00 2001
From 04f024c52f9718f4bfe6267adfd69ab526c0faf7 Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Fri, 4 Jul 2014 23:03:13 +0200
Subject: [PATCH] Make "moved wrongly" limit configurable
@ -35,3 +35,4 @@ index 429ad36..6a230f9 100644
}
--
1.9.1

6
CraftBukkit-Patches/0162-Fix-Null-Tile-Entity-Worlds.patch
View File

@ -1,14 +1,14 @@
From d7749ced81fc9e90c14af68156bfe0ecbeb71a1f Mon Sep 17 00:00:00 2001
From 8163c7a152a768688bd67b61ebfb1b195c037292 Mon Sep 17 00:00:00 2001
From: "Evan A. Haskell" <eah2119@gmail.com>
Date: Thu, 26 Jun 2014 18:37:29 -0400
Subject: [PATCH] Fix Null Tile Entity Worlds
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 3dba573..6100297 100644
index e7cf335..c4fb3d8 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2002,6 +2002,7 @@ public abstract class World implements IBlockAccess {
@@ -1956,6 +1956,7 @@ public abstract class World implements IBlockAccess {
}
}

7
CraftBukkit-Patches/0163-Make-moved-too-quickly-limit-configurable.patch
View File

@ -1,11 +1,11 @@
From 7ff8738025484544f9c23f3ceeda084b78e1dbc2 Mon Sep 17 00:00:00 2001
From c3924409b94295a066fe294cb35c095f9b968bee Mon Sep 17 00:00:00 2001
From: Jonas Konrad <me@yawk.at>
Date: Tue, 22 Jul 2014 15:59:01 +0200
Subject: [PATCH] Make "moved too quickly" limit configurable
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index f064f6e..d8f334a 100644
index cd4f0c9..97037ff 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -371,7 +371,8 @@ public class PlayerConnection implements PacketPlayInListener {
@ -19,7 +19,7 @@ index f064f6e..d8f334a 100644
this.a(this.y, this.z, this.q, this.player.yaw, this.player.pitch);
return;
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 2e6e172..6189566 100644
index 6a230f9..0a63291 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -339,4 +339,10 @@ public class SpigotConfig
@ -35,3 +35,4 @@ index 2e6e172..6189566 100644
}
--
1.9.1

3
CraftBukkit-Patches/0164-Log-debug-levels-to-the-log-file.patch
View File

@ -1,4 +1,4 @@
From 46bc58b1fa5b417fdf572b6d9fb3391896a5d36d Mon Sep 17 00:00:00 2001
From ab9f3b9bace0c77f16bd6e18d1b1f5454452e37d Mon Sep 17 00:00:00 2001
From: Minecrell <dev@minecrell.net>
Date: Thu, 24 Jul 2014 13:18:36 +0200
Subject: [PATCH] Log debug levels to the log file.
@ -27,3 +27,4 @@ index e2209b8..adc0181 100644
</Configuration>
--
1.9.1

10
CraftBukkit-Patches/0165-Alternative-Hopper-Ticking.patch
View File

@ -1,4 +1,4 @@
From afec56d0a9ee4f0509c68ecc46de52311b33e519 Mon Sep 17 00:00:00 2001
From d30aec8b132bc434e89917e6216d0c6d65f685ca Mon Sep 17 00:00:00 2001
From: "Evan A. Haskell" <eah2119@gmail.com>
Date: Sat, 19 Apr 2014 16:58:26 -0400
Subject: [PATCH] Alternative Hopper Ticking
@ -125,10 +125,10 @@ index f1ccd3a..2a1e69d 100644
}
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index aba3748..1f15e40 100644
index 22aac7b..8abbcdf 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -27,6 +27,31 @@ public class EntityOcelot extends EntityTameableAnimal {
@@ -28,6 +28,31 @@ public class EntityOcelot extends EntityTameableAnimal {
this.datawatcher.a(18, Byte.valueOf((byte) 0));
}
@ -369,7 +369,7 @@ index ace3617..65ee96c 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e7cf335..3dba573 100644
index c4fb3d8..6100297 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -113,6 +113,7 @@ public abstract class World implements IBlockAccess {
@ -450,7 +450,7 @@ index e7cf335..3dba573 100644
while (iterator.hasNext()) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 3e6b1e6..a81b7c9 100644
index 2073732..fd79b25 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -166,11 +166,35 @@ public class SpigotWorldConfig

3
CraftBukkit-Patches/0166-Apply-NBTReadLimiter-to-more-things.patch
View File

@ -1,4 +1,4 @@
From 2058c5a4ca7b63a86f429fbf8fecd75ade24464a Mon Sep 17 00:00:00 2001
From 25521b2621ae8b57eab0b24dcd4be04113468af7 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 27 Jul 2014 20:46:04 +1000
Subject: [PATCH] Apply NBTReadLimiter to more things.
@ -64,3 +64,4 @@ index 0000000..dcc0548
+}
--
1.9.1

3
CraftBukkit-Patches/0167-Allow-Attribute-Capping.patch
View File

@ -1,4 +1,4 @@
From e53a899917aeaa613ad54fa0dafafe830971eed6 Mon Sep 17 00:00:00 2001
From 80090075fd17a339df12915499af1da9f5b5060e Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Mon, 28 Jul 2014 16:55:51 +1000
Subject: [PATCH] Allow Attribute Capping.
@ -72,3 +72,4 @@ index 0a63291..4ceeab6 100644
}
--
1.9.1

3
CraftBukkit-Patches/0168-Set-the-minimum-max-health-attribute-value-to-0.1.patch
View File

@ -1,4 +1,4 @@
From fed56f23e31a6d9c3082faccebdb381f568475f9 Mon Sep 17 00:00:00 2001
From 9a9f8e410bb21895d12df0598d4842983e7cc5a8 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Mon, 28 Jul 2014 23:15:00 +0100
Subject: [PATCH] Set the minimum max health attribute value to 0.1
@ -19,3 +19,4 @@ index 70b60ac..7ad88f5 100644
public static final IAttribute d = (new AttributeRanged("generic.movementSpeed", 0.699999988079071D, 0.0D, org.spigotmc.SpigotConfig.movementSpeed)).a("Movement Speed").a(true);
--
1.9.1

3
CraftBukkit-Patches/0169-Add-an-option-for-a-global-cache-for-any-request-on-.patch
View File

@ -1,4 +1,4 @@
From 21dcc9886017354c9497cc378242d970c1733ad4 Mon Sep 17 00:00:00 2001
From 5a6573e4250ecd9d87caa204cc86601eeb900670 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Mon, 28 Jul 2014 11:42:11 +0100
Subject: [PATCH] Add an option for a global cache for any request on Mojang's
@ -285,3 +285,4 @@ index 4ceeab6..9d2dfe9 100644
}
--
1.9.1

6
Spigot-Server-Patches/0001-POM-changes.patch
View File

@ -1,11 +1,11 @@
From 5bf726c8d90dbef44a3efbbb3f39c2ebf759e6d8 Mon Sep 17 00:00:00 2001
From ea806b04341d78de32ad9e2aa7ad67facd21aeb7 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Mon, 21 Jul 2014 15:36:01 -0500
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 6aeffa8..7a1fc32 100644
index 3c0cdff..0c8fbd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -54,7 +54,7 @@ index 6aeffa8..7a1fc32 100644
<artifactId>minecraft-server</artifactId>
<version>${minecraft.version}-SNAPSHOT</version>
<type>jar</type>
@@ -119,7 +119,7 @@
@@ -126,7 +126,7 @@
<artifactId>gitdescribe-maven-plugin</artifactId>
<version>1.3</version>
<configuration>

6
Spigot-Server-Patches/0021-Toggle-for-player-interact-limiter.patch
View File

@ -1,11 +1,11 @@
From 141d19426334270c18b49625a291185a7d542b36 Mon Sep 17 00:00:00 2001
From 3a2f833cbbc263cd50e7a3cdb01c909cc32a7377 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Thu, 24 Jul 2014 22:19:44 -0500
Subject: [PATCH] Toggle for player interact limiter
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index cd4f0c9..43c2278 100644
index 97037ff..43bce01 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -59,6 +59,8 @@ import org.bukkit.inventory.InventoryView;
@ -17,7 +17,7 @@ index cd4f0c9..43c2278 100644
public class PlayerConnection implements PacketPlayInListener {
private static final Logger c = LogManager.getLogger();
@@ -580,7 +582,7 @@ public class PlayerConnection implements PacketPlayInListener {
@@ -581,7 +583,7 @@ public class PlayerConnection implements PacketPlayInListener {
public void a(PacketPlayInBlockPlace packetplayinblockplace) {
boolean throttled = false;

49
Spigot-Server-Patches/0026-Configurable-nerf-for-TNT-cannons.patch
View File

@ -1,49 +0,0 @@
From 221e27c07fcc4d17bc05bf571712c303cd911f6e Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Wed, 9 Jul 2014 17:38:48 -0500
Subject: [PATCH] Configurable nerf for TNT cannons
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
index 8ca4300..3be3d98 100644
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -1,6 +1,7 @@
package net.minecraft.server;
import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit
+import org.github.paperspigot.PaperSpigotWorldConfig;
public class EntityTNTPrimed extends Entity {
@@ -56,6 +57,12 @@ public class EntityTNTPrimed extends Entity {
this.motY *= -0.5D;
}
+ // PaperSpigot start - Configurable nerf for TNT cannons
+ if (this.locY > PaperSpigotWorldConfig.tntHeightNerf && PaperSpigotWorldConfig.tntHeightNerf != 0) {
+ this.die();
+ }
+ // PaperSpigot end
+
if (this.fuseTicks-- <= 0) {
// CraftBukkit start - Need to reverse the order of the explosion and the entity death so we have a location for the event
if (!this.world.isStatic) {
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
index 39bbd62..0d388af 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -169,4 +169,10 @@ public class PaperSpigotWorldConfig
keepSpawnInMemory = getBoolean( "keep-spawn-loaded", true );
log( "Keep spawn chunk loaded: " + keepSpawnInMemory );
}
+
+ public static double tntHeightNerf;
+ private void tntHeightNerf()
+ {
+ tntHeightNerf = getDouble( "tnt-entity-height-nerf", 0 );
+ }
}
--
1.9.1

2
Spigot-Server-Patches/0027-Don-t-tick-chests.patch → Spigot-Server-Patches/0026-Don-t-tick-chests.patch
View File

@ -1,4 +1,4 @@
From 3b0c5832c4aeb770174fcba76448eaeca9e6f577 Mon Sep 17 00:00:00 2001
From fdd261f946571e63e092fc7e4c3f1553f473c6f6 Mon Sep 17 00:00:00 2001
From: Iceee <andrew@opticgaming.tv>
Date: Fri, 11 Jul 2014 01:31:43 -0500
Subject: [PATCH] Don't tick chests

2
Spigot-Server-Patches/0028-Fix-random-position-generator-tendency-to-move-north.patch → Spigot-Server-Patches/0027-Fix-random-position-generator-tendency-to-move-north.patch
View File

@ -1,4 +1,4 @@
From 30b5f3c128191e2131c7482ff4f0bde0f8e4bc6f Mon Sep 17 00:00:00 2001
From 8b0d449cb76d89090aae4723793e9d58a5301d72 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Tue, 22 Jul 2014 21:52:19 -0500
Subject: [PATCH] Fix random position generator tendency to move north west

56
Spigot-Server-Patches/0028-Drop-falling-block-entities-that-are-above-the-speci.patch Normal file
View File

@ -0,0 +1,56 @@
From 4e3e279e87216581baf20ca7826b1fb31e8649b1 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 30 Jul 2014 03:31:43 -0500
Subject: [PATCH] Drop falling block entities that are above the specified
height
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
index df602bd..5a36e1e 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
+import org.github.paperspigot.PaperSpigotWorldConfig;
public class EntityFallingBlock extends Entity {
@@ -67,6 +68,17 @@ public class EntityFallingBlock extends Entity {
++this.ticksLived;
this.motY -= 0.03999999910593033D;
this.move(this.motX, this.motY, this.motZ);
+
+ // PaperSpigot start - Drop falling blocks above the specified height
+ if (PaperSpigotWorldConfig.fallingBlockHeightNerf != 0 && this.locY > PaperSpigotWorldConfig.fallingBlockHeightNerf) {
+ if (this.dropItem) {
+ this.a(new ItemStack(this.id, 1, this.id.getDropData(this.data)), 0.0F);
+ }
+
+ this.die();
+ }
+ // PaperSpigot end
+
this.motX *= 0.9800000190734863D;
this.motY *= 0.9800000190734863D;
this.motZ *= 0.9800000190734863D;
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
index 39bbd62..5e72313 100644
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -169,4 +169,11 @@ public class PaperSpigotWorldConfig
keepSpawnInMemory = getBoolean( "keep-spawn-loaded", true );
log( "Keep spawn chunk loaded: " + keepSpawnInMemory );
}
+
+ public static double fallingBlockHeightNerf;
+ private void fallingBlockHeightNerf()
+ {
+ // Technically a little disingenuous as it applies to all falling blocks but alas, backwards compat prevails!
+ fallingBlockHeightNerf = getDouble( "tnt-entity-height-nerf", 0 );
+ }
}
--
1.9.1