SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Latest progress - restored patches, some issues resolved

Browse Source
This commit is contained in:
Aikar
2020-06-26 02:29:44 -04:00
parent bc5acdddad
commit fe2a0ea500
34 changed files with 338 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Spigot-Server-Patches/Entity-Activation-Range-2.0.patch
View File

@@ -13,18 +13,6 @@ Adds water Mobs to activation range config and nerfs fish
Adds flying monsters to control ghast and phantoms
Adds villagers as separate config
diff --git a/src/main/java/net/minecraft/server/BehaviorController.java b/src/main/java/net/minecraft/server/BehaviorController.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/BehaviorController.java
+++ b/src/main/java/net/minecraft/server/BehaviorController.java
@@ -0,0 +0,0 @@ public class BehaviorController<E extends EntityLiving> {
}
+ public boolean hasActivity(Activity activity) { return c(activity); } // Paper - OBFHELPER
public boolean c(Activity activity) {
return this.j.contains(activity);
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/Entity.java
@@ -636,14 +624,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+
+ if (config.villagersActiveForPanic) {
+ for (Activity activity : VILLAGER_PANIC_IMMUNITIES) {
+ if (behaviorController.hasActivity(activity)) {
+ if (behaviorController.c(activity)) {
+ return 20*5;
+ }
+ }
+ }
+
+ if (config.villagersWorkImmunityAfter > 0 && inactiveFor >= config.villagersWorkImmunityAfter) {
+ if (behaviorController.hasActivity(Activity.WORK)) {
+ if (behaviorController.c(Activity.WORK)) {
+ return config.villagersWorkImmunityFor;
+ }
+ }