72 lines
3.9 KiB
Diff
72 lines
3.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||
|
|
Date: Fri, 7 Feb 2020 14:36:56 -0600
|
||
|
|
Subject: [PATCH] Add option to nerf pigmen from nether portals
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index 7fbd501d70dccf869a4454e2789a5d68f2e15754..9e4591ddc4b755f4ff5a6f1078b51cb13db80480 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -594,4 +594,9 @@ public class PaperWorldConfig {
|
||
|
|
disableHopperMoveEvents = getBoolean("hopper.disable-move-event", disableHopperMoveEvents);
|
||
|
|
log("Hopper Move Item Events: " + (disableHopperMoveEvents ? "disabled" : "enabled"));
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public boolean nerfNetherPortalPigmen = false;
|
||
|
|
+ private void nerfNetherPortalPigmen() {
|
||
|
|
+ nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
index efc9cb6def2f4ee327329dc090d2918ff60d8e19..43f77d01fceab107d3502d282205aa579d64cc4b 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
|
@@ -277,6 +277,7 @@ public abstract class Entity implements Nameable, CommandSource, net.minecraft.s
|
||
|
|
public long activatedTick = Integer.MIN_VALUE;
|
||
|
|
public boolean isTemporarilyActive = false; // Paper
|
||
|
|
public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
|
||
|
|
+ public boolean fromNetherPortal; // Paper
|
||
|
|
protected int numCollisions = 0; // Paper
|
||
|
|
public void inactiveTick() { }
|
||
|
|
// Spigot end
|
||
|
|
@@ -1693,6 +1694,9 @@ public abstract class Entity implements Nameable, CommandSource, net.minecraft.s
|
||
|
|
if (spawnedViaMobSpawner) {
|
||
|
|
tag.putBoolean("Paper.FromMobSpawner", true);
|
||
|
|
}
|
||
|
|
+ if (fromNetherPortal) {
|
||
|
|
+ tag.putBoolean("Paper.FromNetherPortal", true);
|
||
|
|
+ }
|
||
|
|
// Paper end
|
||
|
|
return tag;
|
||
|
|
} catch (Throwable throwable) {
|
||
|
|
@@ -1827,6 +1831,7 @@ public abstract class Entity implements Nameable, CommandSource, net.minecraft.s
|
||
|
|
}
|
||
|
|
|
||
|
|
spawnedViaMobSpawner = tag.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
|
||
|
|
+ fromNetherPortal = tag.getBoolean("Paper.FromNetherPortal");
|
||
|
|
if (tag.contains("Paper.SpawnReason")) {
|
||
|
|
String spawnReasonName = tag.getString("Paper.SpawnReason");
|
||
|
|
try {
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
|
||
|
|
index 805d83a93bce20910d17c3f419bc085251b6cfc1..ae58929886921d0714bf811de92f99dc0dc120dc 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
|
||
|
|
@@ -8,6 +8,7 @@ import net.minecraft.network.chat.Component;
|
||
|
|
import net.minecraft.server.level.ServerLevel;
|
||
|
|
import net.minecraft.world.entity.Entity;
|
||
|
|
import net.minecraft.world.entity.EntityType;
|
||
|
|
+import net.minecraft.world.entity.Mob;
|
||
|
|
import net.minecraft.world.entity.MobSpawnType;
|
||
|
|
import net.minecraft.world.entity.player.Player;
|
||
|
|
import net.minecraft.world.level.BlockGetter;
|
||
|
|
@@ -61,6 +62,8 @@ public class NetherPortalBlock extends Block {
|
||
|
|
|
||
|
|
if (entity != null) {
|
||
|
|
entity.setPortalCooldown();
|
||
|
|
+ entity.fromNetherPortal = true; // Paper
|
||
|
|
+ if (world.paperConfig.nerfNetherPortalPigmen) ((Mob) entity).aware = false; // Paper
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|