2021-06-11 12:02:28 +00:00
|
|
|
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
|
2021-06-16 20:12:05 +00:00
|
|
|
index f2e4939c8144b9bc7441130302ab3e2358c42063..3d14a7dbcc6bc46141596a7e04f790bfe8f560c6 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2021-06-16 06:25:38 +00:00
|
|
|
@@ -482,6 +482,11 @@ public class PaperWorldConfig {
|
2021-06-11 12:02:28 +00:00
|
|
|
log("Hopper Move Item Events: " + (disableHopperMoveEvents ? "disabled" : "enabled"));
|
|
|
|
}
|
2021-06-13 22:05:18 +00:00
|
|
|
|
2021-06-11 12:02:28 +00:00
|
|
|
+ public boolean nerfNetherPortalPigmen = false;
|
|
|
|
+ private void nerfNetherPortalPigmen() {
|
|
|
|
+ nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen);
|
|
|
|
+ }
|
2021-06-13 22:05:18 +00:00
|
|
|
+
|
|
|
|
public int lightQueueSize = 20;
|
|
|
|
private void lightQueueSize() {
|
|
|
|
lightQueueSize = getInt("light-queue-size", lightQueueSize);
|
2021-06-11 12:02:28 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
2021-08-12 17:55:20 +00:00
|
|
|
index ad9098cf2e12d400f2e4ae0a9740c497423f8de3..7ce969911723d34c0027c063c184fa392d09fc12 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2021-06-16 05:36:02 +00:00
|
|
|
@@ -328,6 +328,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
2021-06-11 12:02:28 +00:00
|
|
|
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
|
2021-06-22 10:54:49 +00:00
|
|
|
@@ -1884,6 +1885,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
2021-06-11 12:02:28 +00:00
|
|
|
if (spawnedViaMobSpawner) {
|
2021-06-13 22:05:18 +00:00
|
|
|
nbt.putBoolean("Paper.FromMobSpawner", true);
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
+ if (fromNetherPortal) {
|
2021-06-13 22:05:18 +00:00
|
|
|
+ nbt.putBoolean("Paper.FromNetherPortal", true);
|
2021-06-11 12:02:28 +00:00
|
|
|
+ }
|
|
|
|
// Paper end
|
2021-06-13 22:05:18 +00:00
|
|
|
return nbt;
|
2021-06-11 12:02:28 +00:00
|
|
|
} catch (Throwable throwable) {
|
2021-06-22 10:54:49 +00:00
|
|
|
@@ -2025,6 +2029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
|
2021-06-13 22:05:18 +00:00
|
|
|
spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
|
|
|
|
+ fromNetherPortal = nbt.getBoolean("Paper.FromNetherPortal");
|
|
|
|
if (nbt.contains("Paper.SpawnReason")) {
|
|
|
|
String spawnReasonName = nbt.getString("Paper.SpawnReason");
|
2021-06-11 12:02:28 +00:00
|
|
|
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
|
2021-06-13 22:05:18 +00:00
|
|
|
index e34716f2a19eb578fef3f19182c124d359deb88f..cfea29f5bf1c5e74a0292c1344baaaa49c2f4403 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
|
2021-06-13 22:05:18 +00:00
|
|
|
@@ -66,6 +66,8 @@ public class NetherPortalBlock extends Block {
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
if (entity != null) {
|
|
|
|
entity.setPortalCooldown();
|
|
|
|
+ entity.fromNetherPortal = true; // Paper
|
2021-06-13 22:05:18 +00:00
|
|
|
+ if (world.paperConfig.nerfNetherPortalPigmen) ((net.minecraft.world.entity.Mob) entity).aware = false; // Paper
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|