Skip to content

Commit ce13b50

Browse files
committed
Update upstream (Paper)
1 parent 39a0fc2 commit ce13b50

4 files changed

Lines changed: 11 additions & 11 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ group = gg.pufferfish.pufferfish
33
mcVersion = 26.2
44
apiVersion = 26.2
55

6-
paperCommit = 747c984fcba30da6b159f58f71b75fdea8b2a9b0
6+
paperCommit = 58e1f844b1f37a2efe4e9536f57f4a288733e0cb
77
channel = ALPHA
88

99
org.gradle.configuration-cache = true

pufferfish-api/build.gradle.kts.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
options.use()
6161
options.isDocFilesSubDirs = true
6262
options.links(
63-
@@ -206,6 +_,7 @@
63+
@@ -205,6 +_,7 @@
64+
"https://www.javadocs.dev/org.apache.maven.resolver/maven-resolver-api/1.7.3",
6465
)
6566
options.tags("apiNote:a:API Note:")
66-
options.tags("implNote:a:Implementation Note:")
6767
+ options.addStringOption("-add-modules", "jdk.incubator.vector") // Pufferfish - SIMD Utilities
6868

6969
inputs.files(javadocSourcepath).ignoreEmptyDirectories().withPropertyName(javadocSourcepath.name + "-configuration")

pufferfish-server/minecraft-patches/features/0009-Dynamic-Activation-Of-Brain.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ index 1530810cdb74810e37e3e22ce4fcda4ee7511055..09676b5bae60a825fd803d0161c8306c
9494
public void inactiveTick() {
9595
}
9696
diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java
97-
index 03b3de257f7711165b7dfb14223e2b6fa8954170..8cec47c19ad1627e6224cadac47bb541ec2e17b9 100644
97+
index a23e4b5e1ddc78d3fec6ab84bbac0a15dc485350..445efc937da3069abd7bb710848a0c179f21294c 100644
9898
--- a/net/minecraft/world/entity/EntityType.java
9999
+++ b/net/minecraft/world/entity/EntityType.java
100100
@@ -66,6 +66,7 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T>,
@@ -106,10 +106,10 @@ index 03b3de257f7711165b7dfb14223e2b6fa8954170..8cec47c19ad1627e6224cadac47bb541
106106
private @Nullable Component description;
107107
private final Optional<ResourceKey<LootTable>> lootTable;
108108
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
109-
index a521068fe97243adbf1e7e9b14fe7f0b19f1e65c..934a9812a1242dc49f4c95b3eb82cfe95fa51350 100644
109+
index c2dd2da4bfb7d65ad2730ba1ce771e2b488beda4..2270ba01201198b031744bbb4a32c1d2cebf254b 100644
110110
--- a/net/minecraft/world/entity/Mob.java
111111
+++ b/net/minecraft/world/entity/Mob.java
112-
@@ -221,10 +221,10 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
112+
@@ -220,10 +220,10 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
113113
public void inactiveTick() {
114114
super.inactiveTick();
115115
if (!this.aware) return; // Paper - Do not tick AI for inactive unaware mobs
@@ -122,7 +122,7 @@ index a521068fe97243adbf1e7e9b14fe7f0b19f1e65c..934a9812a1242dc49f4c95b3eb82cfe9
122122
this.targetSelector.tick();
123123
}
124124
}
125-
@@ -843,16 +843,20 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
125+
@@ -825,16 +825,20 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
126126
int idBasedTickCount = this.tickCount + this.getId();
127127
if (idBasedTickCount % 2 != 0 && this.tickCount > 1) {
128128
profiler.push("targetSelector");
@@ -143,7 +143,7 @@ index a521068fe97243adbf1e7e9b14fe7f0b19f1e65c..934a9812a1242dc49f4c95b3eb82cfe9
143143
this.goalSelector.tick();
144144
profiler.pop();
145145
}
146-
@@ -874,6 +878,7 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
146+
@@ -856,6 +860,7 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
147147
profiler.pop();
148148
}
149149

@@ -169,7 +169,7 @@ index bb037ea27688a06bb0d8141ef25d2543d34aba80..65457b512af926bcb669266086d80bb7
169169
}
170170
}
171171
diff --git a/net/minecraft/world/entity/ai/goal/GoalSelector.java b/net/minecraft/world/entity/ai/goal/GoalSelector.java
172-
index fc748f2575e04b05438cfa3803f5ae23aeca3cb4..08e1822b4380f042b2b016d780bf72b4e951f8bd 100644
172+
index 0439543fbb25ddb974550fe9dbdaa479e330937d..c01d4ba94ad17a86610753082d464ba69413908d 100644
173173
--- a/net/minecraft/world/entity/ai/goal/GoalSelector.java
174174
+++ b/net/minecraft/world/entity/ai/goal/GoalSelector.java
175175
@@ -47,6 +47,15 @@ public class GoalSelector {

pufferfish-server/minecraft-patches/features/0015-Throttle-Goal-Selector-On-Inactive-Ticking.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Throttle Goal Selector On Inactive Ticking
55

66

77
diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java
8-
index a1060f0c9868ae969888d4a5968ff64179927378..63eb1e2ee14efaa6011a04c085b464ddd230be65 100644
8+
index 2270ba01201198b031744bbb4a32c1d2cebf254b..8f82b5d31cd98a73e89aaaae39668747b7a1e4a6 100644
99
--- a/net/minecraft/world/entity/Mob.java
1010
+++ b/net/minecraft/world/entity/Mob.java
11-
@@ -216,12 +216,14 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
11+
@@ -215,12 +215,14 @@ public abstract class Mob extends LivingEntity implements Targeting, EquipmentUs
1212
return this.lookControl;
1313
}
1414

0 commit comments

Comments
 (0)