SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität
bacbd8805f
Paper/Spigot-Server-Patches/0439-Add-option-to-nerf-pigmen-from-nether-portals.patch

67 Zeilen
3.6 KiB
Diff
Originalformat Normale Ansicht Verlauf

performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
From 28f89fcd4d3948ad6742e760827edc40c254d23f Mon Sep 17 00:00:00 2001
Add option to nerf pigmen from nether portals (#2937) * Add option to nerf pigmen from nether portals
2020-02-19 02:42:05 +01:00
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
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
index bce502181f..7d408542e7 100644
Add option to nerf pigmen from nether portals (#2937) * Add option to nerf pigmen from nether portals
2020-02-19 02:42:05 +01:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -653,4 +653,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/server/BlockPortal.java b/src/main/java/net/minecraft/server/BlockPortal.java
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
index 2dc3ab4cfa..09c7c13183 100644
Add option to nerf pigmen from nether portals (#2937) * Add option to nerf pigmen from nether portals
2020-02-19 02:42:05 +01:00
--- a/src/main/java/net/minecraft/server/BlockPortal.java
+++ b/src/main/java/net/minecraft/server/BlockPortal.java
@@ -45,6 +45,8 @@ public class BlockPortal extends Block {
Entity entity = EntityTypes.ZOMBIE_PIGMAN.spawnCreature(worldserver, (NBTTagCompound) null, (IChatBaseComponent) null, (EntityHuman) null, blockposition.up(), EnumMobSpawn.STRUCTURE, false, false, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NETHER_PORTAL);
if (entity != null) {
+ entity.fromNetherPortal = true; // Paper
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f52c70ab Fix incorrect nullability in MultipleFacing 6af4c0b2 SPIGOT-5311: Add API to get/set item associated with throwable projectiles 97aeae56 Add set/isAware to disable Vanilla AI components of a Mob CraftBukkit Changes: fba9f487 Improve legacy conversion of some materials that changed post flattening b1ba8749 Move Bukkit.Aware loading/saving to correct location f7cdb53c SPIGOT-5311: Add API to get/set item associated with throwable projectiles 689f429c #634: Cross platform patch scripts ab85433d Add set/isAware to disable Vanilla AI components of a Mob Spigot Changes: 8faa8b45 Rebuild patches
2020-02-21 18:52:20 +01:00
+ if (worldserver.paperConfig.nerfNetherPortalPigmen) ((EntityInsentient) entity).aware = false; // Paper
Add option to nerf pigmen from nether portals (#2937) * Add option to nerf pigmen from nether portals
2020-02-19 02:42:05 +01:00
entity.portalCooldown = entity.ba();
}
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
index c4e85b86d9..8da54c68cc 100644
Add option to nerf pigmen from nether portals (#2937) * Add option to nerf pigmen from nether portals
2020-02-19 02:42:05 +01:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
@@ -194,6 +194,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
Add option to nerf pigmen from nether portals (#2937) * Add option to nerf pigmen from nether portals
2020-02-19 02:42:05 +01:00
public long activatedTick = Integer.MIN_VALUE;
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
public boolean isTemporarilyActive = false; // Paper
Add option to nerf pigmen from nether portals (#2937) * Add option to nerf pigmen from nether portals
2020-02-19 02:42:05 +01:00
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
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
@@ -1638,6 +1639,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
Add option to nerf pigmen from nether portals (#2937) * Add option to nerf pigmen from nether portals
2020-02-19 02:42:05 +01:00
if (spawnedViaMobSpawner) {
nbttagcompound.setBoolean("Paper.FromMobSpawner", true);
}
+ if (fromNetherPortal) {
+ nbttagcompound.setBoolean("Paper.FromNetherPortal", true);
+ }
// Paper end
return nbttagcompound;
} catch (Throwable throwable) {
performance: Many Entity Activation Range Improvements 1) Immunity no longer gives 20 tick immunity, each immunity check can give its own tick value on how long it lasts, drastically cutting down on most to 0-1 ticks. 2) Fixed Villager Immunity to use proper 1.15 check for Breeding. 3) Fixed Water Mobs being 100% immune due to the inWater check... 4) Fixed flying mobs being 100% immune due to the !onGround check... 5) Made Insentient mobs only check for the hasTasks during immunity check window, not every single tick. this made them way more active than desired - this puts behavior closer to inline with my original behavior in Spigot, but still does some checks to allow them temporary immunity, just not as much as before. 6) Inactive Entities would "inch" while trying to move, effectively getting nowhere. Now while an entity is inactive, it just won't even try to move. - this saves us from the expensiveness of Entity movement 1 out of 20 ticks. Now they will only move while either active or triggered a true immunity.
2020-03-30 04:26:44 +02:00
@@ -1760,6 +1764,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
Add option to nerf pigmen from nether portals (#2937) * Add option to nerf pigmen from nether portals
2020-02-19 02:42:05 +01:00
}
spawnedViaMobSpawner = nbttagcompound.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
+ fromNetherPortal = nbttagcompound.getBoolean("Paper.FromNetherPortal");
if (nbttagcompound.hasKey("Paper.SpawnReason")) {
String spawnReasonName = nbttagcompound.getString("Paper.SpawnReason");
try {
--
Drop Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch This patch appears to be no longer relevant, and is seemingly a leading cause of datapack performance being horrific
2020-03-15 21:03:36 +01:00
2.25.1
Add option to nerf pigmen from nether portals (#2937) * Add option to nerf pigmen from nether portals
2020-02-19 02:42:05 +01:00
In neuem Issue referenzieren Permalink kopieren