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/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
2024-10-23 15:54:09 +02:00
|
|
|
index 463d34e7b54efd503c4879d1386b2439474863dd..fa80b6220aba144521dc0a2a35914c10046c1963 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
|
2024-10-23 15:54:09 +02:00
|
|
|
@@ -406,6 +406,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
2024-01-24 11:45:17 +01:00
|
|
|
public void inactiveTick() { }
|
2024-01-23 15:43:48 +01:00
|
|
|
// Spigot end
|
2024-01-22 19:01:10 +01:00
|
|
|
protected int numCollisions = 0; // Paper - Cap entity collisions
|
2024-01-21 12:53:04 +01:00
|
|
|
+ public boolean fromNetherPortal; // Paper - Add option to nerf pigmen from nether portals
|
2021-12-03 22:28:15 +01:00
|
|
|
public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
|
2024-01-24 11:45:17 +01:00
|
|
|
// Paper start - Entity origin API
|
2021-12-03 22:28:15 +01:00
|
|
|
@javax.annotation.Nullable
|
2024-10-23 15:54:09 +02:00
|
|
|
@@ -2398,6 +2399,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
2021-06-11 14:02:28 +02:00
|
|
|
if (spawnedViaMobSpawner) {
|
2023-12-06 19:36:49 +01:00
|
|
|
nbttagcompound.putBoolean("Paper.FromMobSpawner", true);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
+ if (fromNetherPortal) {
|
2023-12-06 19:36:49 +01:00
|
|
|
+ nbttagcompound.putBoolean("Paper.FromNetherPortal", true);
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
// Paper end
|
2023-12-05 23:55:31 +01:00
|
|
|
return nbttagcompound;
|
2021-06-11 14:02:28 +02:00
|
|
|
} catch (Throwable throwable) {
|
2024-10-23 15:54:09 +02:00
|
|
|
@@ -2541,6 +2545,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
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
|
2024-10-23 15:54:09 +02:00
|
|
|
index 5d4c0d7fec42bf843b11875f7a09bcb9279b3b54..dea13596eb8a3b7bc69c19545b2227b4c45ed241 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
|
2024-10-23 15:54:09 +02:00
|
|
|
@@ -89,6 +89,10 @@ public class NetherPortalBlock extends Block implements Portal {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
if (entity != null) {
|
|
|
|
entity.setPortalCooldown();
|
2024-10-23 15:54:09 +02:00
|
|
|
+ // Paper start - Add option to nerf pigmen from nether portals
|
|
|
|
+ entity.fromNetherPortal = true;
|
|
|
|
+ if (world.paperConfig().entities.behavior.nerfPigmenFromNetherPortals) ((net.minecraft.world.entity.Mob) entity).aware = false;
|
|
|
|
+ // Paper end - Add option to nerf pigmen from nether portals
|
|
|
|
Entity entity1 = entity.getVehicle();
|
|
|
|
|
|
|
|
if (entity1 != null) {
|