mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 06:24:06 +01:00
5b4bc3081a
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
39 lines
1.9 KiB
Diff
39 lines
1.9 KiB
Diff
From b1b17791ca84eb2b8450716e591731fc34ee44e2 Mon Sep 17 00:00:00 2001
|
|
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
|
|
index bec5aa8..222e3ac 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockPortal.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
|
|
@@ -15,7 +15,7 @@ public class BlockPortal extends BlockHalfTransparent {
|
|
|
|
public void a(World world, int i, int j, int k, Random random) {
|
|
super.a(world, i, j, k, random);
|
|
- if (world.worldProvider.d() && world.getGameRules().getBoolean("doMobSpawning") && random.nextInt(2000) < world.difficulty.a()) {
|
|
+ if (world.spigotConfig.enableZombiePigmenPortalSpawns && world.worldProvider.d() && world.getGameRules().getBoolean("doMobSpawning") && random.nextInt(2000) < world.difficulty.a()) { // Spigot
|
|
int 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
|
|
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 );
|
|
+ }
|
|
}
|
|
--
|
|
1.9.1
|
|
|