core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/CraftBukkit-Patches/0073-Allow-toggling-of-Zomb...

39 lines
1.9 KiB
Diff
Raw Normal View History

Upstream merge.
2015-01-05 03:32:01 +00:00
From 451abb7a24418dc47c918fe45020e01a68c8588f Mon Sep 17 00:00:00 2001
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
From: Dmck2b <dmck2b+github@gmail.com>
Date: Mon, 20 Jan 2014 20:18:23 +0000
Subject: [PATCH] Allow toggling of ZombiePigmen spawning in portal blocks
diff --git a/src/main/java/net/minecraft/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
index 7565dfb..368d67c 100644
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
--- a/src/main/java/net/minecraft/server/BlockPortal.java
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
@@ -16,7 +16,7 @@ public class BlockPortal extends BlockHalfTransparent {
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
public void b(World world, BlockPosition blockposition, IBlockData iblockdata, Random random) {
super.b(world, blockposition, iblockdata, random);
- if (world.worldProvider.d() && world.getGameRules().getBoolean("doMobSpawning") && random.nextInt(2000) < world.getDifficulty().a()) {
+ if (world.spigotConfig.enableZombiePigmenPortalSpawns && world.worldProvider.d() && world.getGameRules().getBoolean("doMobSpawning") && random.nextInt(2000) < world.getDifficulty().a()) { // Spigot
int i = blockposition.getY();
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
BlockPosition blockposition1;
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
index d7766bb..5c1d59c 100644
--- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
+++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
@@ -259,4 +259,11 @@ public class SpigotWorldConfig
nerfSpawnerMobs = getBoolean( "nerf-spawner-mobs", false );
log( "Nerfing mobs spawned from spawners: " + nerfSpawnerMobs );
}
+
+ public boolean enableZombiePigmenPortalSpawns;
+ private void enableZombiePigmenPortalSpawns()
+ {
+ enableZombiePigmenPortalSpawns = getBoolean( "enable-zombie-pigmen-portal-spawns", true );
+ log( "Allow Zombie Pigmen to spawn from portal blocks: " + enableZombiePigmenPortalSpawns );
+ }
}
--
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
2.1.0
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00