core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97 from Dmck2b/master 

Fix missing colons in startup log messages
This commit is contained in:
thinkofdeath 2014-01-21 13:45:52 -08:00
parent 80c8e1ac31 279df65068
commit 13c46dd878
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CraftBukkit-Patches/0081-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch
View File

@ -1,4 +1,4 @@
From b74e50dac0676245ae0584e91329e07331b7b1e8 Mon Sep 17 00:00:00 2001 From 41cb6d4ca3f46f4eb9640298e2dc790c072c4ee4 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net> From: md_5 <git@md-5.net>
Date: Sun, 22 Dec 2013 20:58:02 +1100 Date: Sun, 22 Dec 2013 20:58:02 +1100
Subject: [PATCH] Add Option to Nerf Mobs from Spawner's Subject: [PATCH] Add Option to Nerf Mobs from Spawner's
@ -51,7 +51,7 @@ index bb6b3d5..1eb8818 100644
// CraftBukkit end // CraftBukkit end
} }
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index e7cb99d..50d3069 100644 index e7cb99d..018ec18 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -250,4 +250,11 @@ public class SpigotWorldConfig @@ -250,4 +250,11 @@ public class SpigotWorldConfig
@ -63,9 +63,9 @@ index e7cb99d..50d3069 100644
+ private void nerfSpawnerMobs() + private void nerfSpawnerMobs()
+ { + {
+ nerfSpawnerMobs = getBoolean( "nerf-spawner-mobs", false ); + nerfSpawnerMobs = getBoolean( "nerf-spawner-mobs", false );
+ log( "Nerfing mobs spawned from spawners " + nerfSpawnerMobs ); + log( "Nerfing mobs spawned from spawners: " + nerfSpawnerMobs );
+ } + }
} }
-- --
1.8.4.msysgit.0 1.8.3.2

10
CraftBukkit-Patches/0099-Allow-toggling-of-ZombiePigmen-spawning-in-portal-bl.patch
View File

@ -1,4 +1,4 @@
From 59dff65fcf4037b97e692fb7b20af04327e09862 Mon Sep 17 00:00:00 2001 From af8afd23eb1bf5f0a94210f0a2b81fc9afa11ad2 Mon Sep 17 00:00:00 2001
From: Dmck2b <dmck2b+github@gmail.com> From: Dmck2b <dmck2b+github@gmail.com>
Date: Mon, 20 Jan 2014 20:18:23 +0000 Date: Mon, 20 Jan 2014 20:18:23 +0000
Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks
@ -18,21 +18,21 @@ index 75b833a..4f5bea9 100644
for (l = j; !World.a((IBlockAccess) world, i, l, k) && l > 0; --l) { for (l = j; !World.a((IBlockAccess) world, i, l, k) && l > 0; --l) {
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index 50d3069..d1caf8c 100644 index 018ec18..5a6e369 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -257,4 +257,11 @@ public class SpigotWorldConfig @@ -257,4 +257,11 @@ public class SpigotWorldConfig
nerfSpawnerMobs = getBoolean( "nerf-spawner-mobs", false ); nerfSpawnerMobs = getBoolean( "nerf-spawner-mobs", false );
log( "Nerfing mobs spawned from spawners " + nerfSpawnerMobs ); log( "Nerfing mobs spawned from spawners: " + nerfSpawnerMobs );
} }
+ +
+ public boolean enableZombiePigmenPortalSpawns; + public boolean enableZombiePigmenPortalSpawns;
+ private void enableZombiePigmenPortalSpawns() + private void enableZombiePigmenPortalSpawns()
+ { + {
+ enableZombiePigmenPortalSpawns = getBoolean( "enable-zombie-pigmen-portal-spawns", true ); + enableZombiePigmenPortalSpawns = getBoolean( "enable-zombie-pigmen-portal-spawns", true );
+ log( "Allow Zombie Pigmen to spawn from portal blocks " + enableZombiePigmenPortalSpawns ); + log( "Allow Zombie Pigmen to spawn from portal blocks: " + enableZombiePigmenPortalSpawns );
+ } + }
} }
-- --
1.8.4.msysgit.0 1.8.3.2