34 lines
2.0 KiB
Diff
34 lines
2.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: BrodyBeckwith <brody@beckwith.dev>
|
||
|
|
Date: Fri, 9 Oct 2020 20:30:12 -0400
|
||
|
|
Subject: [PATCH] Allow disabling mob spawner spawn egg transformation
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index a3b3e3e04b7a5e3a351992e06870cc91fbd8adc8..b48067c71f9de18ba40e970e2832f6245984a218 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -722,4 +722,9 @@ public class PaperWorldConfig {
|
||
|
|
private void fixCuringExploit() {
|
||
|
|
fixCuringZombieVillagerDiscountExploit = getBoolean("game-mechanics.fix-curing-zombie-villager-discount-exploit", fixCuringZombieVillagerDiscountExploit);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public boolean disableMobSpawnerSpawnEggTransformation = false;
|
||
|
|
+ private void disableMobSpawnerSpawnEggTransformation() {
|
||
|
|
+ disableMobSpawnerSpawnEggTransformation = getBoolean("game-mechanics.disable-mob-spawner-spawn-egg-transformation", disableMobSpawnerSpawnEggTransformation);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/item/SpawnEggItem.java b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
|
||
|
|
index 9aae1435a271bb17d6355e4c75ccbce78cb9d449..7904a2176253eaf48b47e06dd2e19758a673873c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/item/SpawnEggItem.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/item/SpawnEggItem.java
|
||
|
|
@@ -60,7 +60,7 @@ public class SpawnEggItem extends Item {
|
||
|
|
Direction enumdirection = context.getClickedFace();
|
||
|
|
BlockState iblockdata = world.getBlockState(blockposition);
|
||
|
|
|
||
|
|
- if (iblockdata.is(Blocks.SPAWNER)) {
|
||
|
|
+ if (!world.paperConfig.disableMobSpawnerSpawnEggTransformation && iblockdata.is(Blocks.SPAWNER)) { // Paper
|
||
|
|
BlockEntity tileentity = world.getBlockEntity(blockposition);
|
||
|
|
|
||
|
|
if (tileentity instanceof SpawnerBlockEntity) {
|