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/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
2022-09-01 16:51:59 +00:00
|
|
|
index 240650cee26fc907f632e0c8ef3559a36460a3ba..185f6dd93f325b638289acd723c6cbbbedac80e1 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
|
2022-07-04 14:38:06 +00:00
|
|
|
@@ -386,6 +386,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
2021-12-03 21:28:15 +00:00
|
|
|
// Paper start
|
2021-08-21 14:15:29 +00:00
|
|
|
public long activatedImmunityTick = Integer.MIN_VALUE; // Paper
|
2021-06-11 12:02:28 +00:00
|
|
|
public boolean isTemporarilyActive = false; // Paper
|
|
|
|
+ public boolean fromNetherPortal; // Paper
|
|
|
|
protected int numCollisions = 0; // Paper
|
2021-12-03 21:28:15 +00:00
|
|
|
public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
|
|
|
|
@javax.annotation.Nullable
|
2022-07-27 20:17:18 +00:00
|
|
|
@@ -1978,6 +1979,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
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) {
|
2022-07-27 20:17:18 +00:00
|
|
|
@@ -2119,6 +2123,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
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
|
2022-06-09 08:51:45 +00:00
|
|
|
index 33078e2199c8eb0ce012a72eeb4421df12817b84..8c97cae63b4b373f1d67e797b9fe1064b5205da5 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
|
2022-06-09 08:51:45 +00:00
|
|
|
+ if (world.paperConfig().entities.behavior.nerfPigmenFromNetherPortals) ((net.minecraft.world.entity.Mob) entity).aware = false; // Paper
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|