twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-20 14:53:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Commands

Browse Source
This commit is contained in:
Nassim Jahnke
2024-12-13 21:21:48 +01:00
parent 2509faa08e
commit f73e864f18
15 changed files with 450 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
paper-server/patches/sources/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
+++ b/net/minecraft/world/entity/ai/navigation/FlyingPathNavigation.java
@@ -39,7 +_,7 @@
@Override
public Path createPath(Entity entity, int i) {
- return this.createPath(entity.blockPosition(), i);
+ return this.createPath(entity.blockPosition(), entity, i); // Paper - EntityPathfindEvent
}
@Override

46
paper-server/patches/sources/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java.patch Normal file
View File

@@ -0,0 +1,46 @@
--- a/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
+++ b/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
@@ -41,7 +_,7 @@
}
@Override
- public Path createPath(BlockPos pos, int accuracy) {
+ public Path createPath(BlockPos pos, @javax.annotation.Nullable Entity entity, int accuracy) { // Paper - EntityPathfindEvent
LevelChunk chunkNow = this.level.getChunkSource().getChunkNow(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ()));
if (chunkNow == null) {
return null;
@@ -54,7 +_,7 @@
}
if (mutableBlockPos.getY() > this.level.getMinY()) {
- return super.createPath(mutableBlockPos.above(), accuracy);
+ return super.createPath(mutableBlockPos.above(), entity, accuracy); // Paper - EntityPathfindEvent
}
mutableBlockPos.setY(pos.getY() + 1);
@@ -67,7 +_,7 @@
}
if (!chunkNow.getBlockState(pos).isSolid()) {
- return super.createPath(pos, accuracy);
+ return super.createPath(pos, entity, accuracy); // Paper - EntityPathfindEvent
} else {
BlockPos.MutableBlockPos mutableBlockPos = pos.mutable().move(Direction.UP);
@@ -75,14 +_,14 @@
mutableBlockPos.move(Direction.UP);
}
- return super.createPath(mutableBlockPos.immutable(), accuracy);
+ return super.createPath(mutableBlockPos.immutable(), entity, accuracy); // Paper - EntityPathfindEvent
}
}
}
@Override
public Path createPath(Entity entity, int i) {
- return this.createPath(entity.blockPosition(), i);
+ return this.createPath(entity.blockPosition(), entity, i); // Paper - EntityPathfindEvent
}
private int getSurfaceY() {

106
paper-server/patches/sources/net/minecraft/world/entity/ai/navigation/PathNavigation.java.patch Normal file
View File

@@ -0,0 +1,106 @@
--- a/net/minecraft/world/entity/ai/navigation/PathNavigation.java
+++ b/net/minecraft/world/entity/ai/navigation/PathNavigation.java
@@ -125,7 +_,13 @@
@Nullable
public Path createPath(BlockPos pos, int accuracy) {
- return this.createPath(ImmutableSet.of(pos), 8, false, accuracy);
+ // Paper start - EntityPathfindEvent
+ return this.createPath(pos, null, accuracy);
+ }
+ @Nullable
+ public Path createPath(BlockPos target, @Nullable Entity entity, int accuracy) {
+ return this.createPath(ImmutableSet.of(target), entity, 8, false, accuracy);
+ // Paper end - EntityPathfindEvent
}
@Nullable
@@ -135,7 +_,7 @@
@Nullable
public Path createPath(Entity entity, int accuracy) {
- return this.createPath(ImmutableSet.of(entity.blockPosition()), 16, true, accuracy);
+ return this.createPath(ImmutableSet.of(entity.blockPosition()), entity, 16, true, accuracy); // Paper - EntityPathfindEvent
}
@Nullable
@@ -145,6 +_,18 @@
@Nullable
protected Path createPath(Set<BlockPos> targets, int regionOffset, boolean offsetUpward, int accuracy, float followRange) {
+ // Paper start - EntityPathfindEvent
+ return this.createPath(targets, null, regionOffset, offsetUpward, accuracy, followRange);
+ }
+
+ @Nullable
+ protected Path createPath(Set<BlockPos> targets, @Nullable Entity target, int regionOffset, boolean offsetUpward, int accuracy) {
+ return this.createPath(targets, target, regionOffset, offsetUpward, accuracy, (float) this.mob.getAttributeValue(Attributes.FOLLOW_RANGE));
+ }
+
+ @Nullable
+ protected Path createPath(Set<BlockPos> targets, @Nullable Entity target, int regionOffset, boolean offsetUpward, int accuracy, float followRange) {
+ // Paper end - EntityPathfindEvent
if (targets.isEmpty()) {
return null;
} else if (this.mob.getY() < this.level.getMinY()) {
@@ -154,6 +_,23 @@
} else if (this.path != null && !this.path.isDone() && targets.contains(this.targetPos)) {
return this.path;
} else {
+ // Paper start - EntityPathfindEvent
+ boolean copiedSet = false;
+ for (BlockPos possibleTarget : targets) {
+ if (!this.mob.getCommandSenderWorld().getWorldBorder().isWithinBounds(possibleTarget) || !new com.destroystokyo.paper.event.entity.EntityPathfindEvent(this.mob.getBukkitEntity(), // Paper - don't path out of world border
+ io.papermc.paper.util.MCUtil.toLocation(this.mob.level(), possibleTarget), target == null ? null : target.getBukkitEntity()).callEvent()) {
+ if (!copiedSet) {
+ copiedSet = true;
+ targets = new java.util.HashSet<>(targets);
+ }
+ // note: since we copy the set this remove call is safe, since we're iterating over the old copy
+ targets.remove(possibleTarget);
+ if (targets.isEmpty()) {
+ return null;
+ }
+ }
+ }
+ // Paper end - EntityPathfindEvent
ProfilerFiller profilerFiller = Profiler.get();
profilerFiller.push("pathfind");
BlockPos blockPos = offsetUpward ? this.mob.blockPosition().above() : this.mob.blockPosition();
@@ -171,6 +_,11 @@
}
}
+ // Paper start - Perf: Optimise pathfinding
+ private int lastFailure = 0;
+ private int pathfindFailures = 0;
+ // Paper end - Perf: Optimise pathfinding
+
public boolean moveTo(double x, double y, double z, double speed) {
return this.moveTo(this.createPath(x, y, z, 1), speed);
}
@@ -180,8 +_,23 @@
}
public boolean moveTo(Entity entity, double speed) {
+ // Paper start - Perf: Optimise pathfinding
+ if (this.pathfindFailures > 10 && this.path == null && net.minecraft.server.MinecraftServer.currentTick < this.lastFailure + 40) {
+ return false;
+ }
+ // Paper end - Perf: Optimise pathfinding
Path path = this.createPath(entity, 1);
- return path != null && this.moveTo(path, speed);
+ // Paper start - Perf: Optimise pathfinding
+ if (path != null && this.moveTo(path, speed)) {
+ this.lastFailure = 0;
+ this.pathfindFailures = 0;
+ return true;
+ } else {
+ this.pathfindFailures++;
+ this.lastFailure = net.minecraft.server.MinecraftServer.currentTick;
+ return false;
+ }
+ // Paper end - Perf: Optimise pathfinding
}
public boolean moveTo(@Nullable Path pathentity, double speed) {

14
paper-server/patches/sources/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java.patch Normal file
View File

@@ -0,0 +1,14 @@
--- a/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
+++ b/net/minecraft/world/entity/ai/navigation/WallClimberNavigation.java
@@ -16,9 +_,9 @@
}
@Override
- public Path createPath(BlockPos pos, int accuracy) {
+ public Path createPath(BlockPos pos, @Nullable Entity entity, int accuracy) {
this.pathToPosition = pos;
- return super.createPath(pos, accuracy);
+ return super.createPath(pos, entity, accuracy); // Paper - EntityPathfindEvent
}
@Override

2
paper-server/patches/sources/net/minecraft/world/entity/animal/horse/AbstractHorse.java.patch
View File

@@ -83,7 +83,7 @@
@@ -340,7 +_,7 @@
protected void createInventory() {
public void createInventory() {
SimpleContainer simpleContainer = this.inventory;
- this.inventory = new SimpleContainer(this.getInventorySize());
+ this.inventory = new SimpleContainer(this.getInventorySize(), (org.bukkit.entity.AbstractHorse) this.getBukkitEntity()); // CraftBukkit