diff options
| author | Jason <[email protected]> | 2022-05-29 12:54:25 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-05-29 12:54:25 -0700 |
| commit | af3b3778f6de06af48de08d41a43565d3ff19976 (patch) | |
| tree | 77b45ab00e1dfde03c3dee2aa92e64aae6b0909f /patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch | |
| parent | 3f7fbe316d85040cde5e0694861a5b1675170efb (diff) | |
| download | Paper-af3b3778f6de06af48de08d41a43565d3ff19976.tar.gz Paper-af3b3778f6de06af48de08d41a43565d3ff19976.zip | |
Update ForgeFlower (#7857)
Diffstat (limited to 'patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch')
| -rw-r--r-- | patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch index ca6be84632..75bec689ce 100644 --- a/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch +++ b/patches/server/0685-Rate-options-and-timings-for-sensors-and-behaviors.patch @@ -28,7 +28,7 @@ index b47b7dce26805badd422c1867733ff4bfd00e9f4..b27021a42cbed3f0648a8d0903d00d03 * Get a named timer for the specified tile entity type to track type specific timings. * @param entity diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a8afdd402a0fe90ba73ae7fc60fa335f80cf267b..96895f4e14924ff23ab1b17d298dd8abf7f2493e 100644 +index 40b3c6ef824e96747d3c01129e4dbaaaa3d3613a..3dc62c72e9d3db93d3e118814cfada6c275b8e3f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -9,8 +9,10 @@ import it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap; @@ -101,10 +101,10 @@ index a8afdd402a0fe90ba73ae7fc60fa335f80cf267b..96895f4e14924ff23ab1b17d298dd8ab + } } diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java -index b1212e162ba938b3abe0df747a633ba9cbbe57c8..c24ff2ef1054523e58892c2b35080cffb6ab744a 100644 +index bc4aab719d42e6d17585e6492b873f801e5d75cf..dcd76598ca41fbed8fb4e62118552659f8cb605c 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/Behavior.java -@@ -14,6 +14,10 @@ public abstract class Behavior<E extends LivingEntity> { +@@ -13,6 +13,10 @@ public abstract class Behavior<E extends LivingEntity> { private long endTimestamp; private final int minDuration; private final int maxDuration; @@ -115,7 +115,7 @@ index b1212e162ba938b3abe0df747a633ba9cbbe57c8..c24ff2ef1054523e58892c2b35080cff public Behavior(Map<MemoryModuleType<?>, MemoryStatus> requiredMemoryState) { this(requiredMemoryState, 60); -@@ -27,6 +31,15 @@ public abstract class Behavior<E extends LivingEntity> { +@@ -26,6 +30,15 @@ public abstract class Behavior<E extends LivingEntity> { this.minDuration = minRunTime; this.maxDuration = maxRunTime; this.entryCondition = requiredMemoryState; @@ -131,7 +131,7 @@ index b1212e162ba938b3abe0df747a633ba9cbbe57c8..c24ff2ef1054523e58892c2b35080cff } public Behavior.Status getStatus() { -@@ -34,11 +47,19 @@ public abstract class Behavior<E extends LivingEntity> { +@@ -33,11 +46,19 @@ public abstract class Behavior<E extends LivingEntity> { } public final boolean tryStart(ServerLevel world, E entity, long time) { @@ -151,7 +151,7 @@ index b1212e162ba938b3abe0df747a633ba9cbbe57c8..c24ff2ef1054523e58892c2b35080cff return true; } else { return false; -@@ -49,11 +70,13 @@ public abstract class Behavior<E extends LivingEntity> { +@@ -48,11 +69,13 @@ public abstract class Behavior<E extends LivingEntity> { } public final void tickOrStop(ServerLevel world, E entity, long time) { |