2021-06-11 14:02:28 +02: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-08-25 09:59:26 +02:00
|
|
|
index 7dc740d392becc622e98a5a83be332adf6fcc4e8..9e1263804f1a07400a21e5ce705c24b2b771219c 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2021-06-16 08:25:38 +02:00
|
|
|
@@ -482,6 +482,11 @@ public class PaperWorldConfig {
|
2021-06-11 14:02:28 +02:00
|
|
|
log("Hopper Move Item Events: " + (disableHopperMoveEvents ? "disabled" : "enabled"));
|
|
|
|
}
|
2021-06-14 00:05:18 +02:00
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
+ public boolean nerfNetherPortalPigmen = false;
|
|
|
|
+ private void nerfNetherPortalPigmen() {
|
|
|
|
+ nerfNetherPortalPigmen = getBoolean("game-mechanics.nerf-pigmen-from-nether-portals", nerfNetherPortalPigmen);
|
|
|
|
+ }
|
2021-06-14 00:05:18 +02:00
|
|
|
+
|
|
|
|
public int lightQueueSize = 20;
|
|
|
|
private void lightQueueSize() {
|
|
|
|
lightQueueSize = getInt("light-queue-size", lightQueueSize);
|
2021-06-11 14:02:28 +02: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-25 09:59:26 +02:00
|
|
|
index 635607e8fb58b7e9a5eca7d43ad028cf8815f67b..9e692c816bb8173dba7314866e3321bfa24e577e 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2021-08-25 09:59:26 +02:00
|
|
|
@@ -330,6 +330,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
2021-08-21 16:15:29 +02:00
|
|
|
public long activatedImmunityTick = Integer.MIN_VALUE; // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
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-08-25 09:59:26 +02:00
|
|
|
@@ -1887,6 +1888,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
2021-06-11 14:02:28 +02:00
|
|
|
if (spawnedViaMobSpawner) {
|
2021-06-14 00:05:18 +02:00
|
|
|
nbt.putBoolean("Paper.FromMobSpawner", true);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
+ if (fromNetherPortal) {
|
2021-06-14 00:05:18 +02:00
|
|
|
+ nbt.putBoolean("Paper.FromNetherPortal", true);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
// Paper end
|
2021-06-14 00:05:18 +02:00
|
|
|
return nbt;
|
2021-06-11 14:02:28 +02:00
|
|
|
} catch (Throwable throwable) {
|
2021-08-25 09:59:26 +02:00
|
|
|
@@ -2028,6 +2032,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2021-06-14 00:05:18 +02: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 14:02:28 +02: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-14 00:05:18 +02:00
|
|
|
index e34716f2a19eb578fef3f19182c124d359deb88f..cfea29f5bf1c5e74a0292c1344baaaa49c2f4403 100644
|
2021-06-11 14:02:28 +02: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-14 00:05:18 +02:00
|
|
|
@@ -66,6 +66,8 @@ public class NetherPortalBlock extends Block {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
if (entity != null) {
|
|
|
|
entity.setPortalCooldown();
|
|
|
|
+ entity.fromNetherPortal = true; // Paper
|
2021-06-14 00:05:18 +02:00
|
|
|
+ if (world.paperConfig.nerfNetherPortalPigmen) ((net.minecraft.world.entity.Mob) entity).aware = false; // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|