Repo-Mirror/PetalMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

feat: Upstream

Browse Source
This commit is contained in:
peaches94
2022-10-02 13:44:19 -05:00
parent cc713c04e0
commit 3efc156fee
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -5,4 +5,4 @@ org.gradle.vfs.watch=false
group=host.bloom.petal group=host.bloom.petal
version=1.19.2-R0.1-SNAPSHOT version=1.19.2-R0.1-SNAPSHOT
mcVersion=1.19.2 mcVersion=1.19.2
purpurRef=3bd6f8fc3c251df3b89d73ea780e3219e4f67119 purpurRef=0008a68c1be431a9253cfd23ac778ffbc4d78cc4

8
patches/server/0001-conf-brand-server-to-petal.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] conf: brand server to petal
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index dc00d06f9bd4cc7403e0fe89822ed40ed2e148c8..dc7851397bb5a0696747113d767d5f4a79c93026 100644 index 441a18132eb60e1af8b624ab7cf3de61669ced1f..27b3535f53c1de721b71e04c80688e1907230178 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins { @@ -9,7 +9,7 @@ plugins {
@@ -84,7 +84,7 @@ index fba5dbdb7bcbb55400ef18342c9b54612972a718..3f9aa4292ff45c6b6af0ddfeecb645f8
switch (distance) { switch (distance) {
case -1: case -1:
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 24f767663b1190dcada3da554375e3a01064c462..f996609e8f478845f850daefc4e611e41826c4eb 100644 index d7c77908ba7f0a0c00c06744d1ee0c1ad3ee0d7c..8527b1d2c559ce9c4608725dd455a000c75d0333 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -916,7 +916,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -916,7 +916,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -96,7 +96,7 @@ index 24f767663b1190dcada3da554375e3a01064c462..f996609e8f478845f850daefc4e611e4
while (this.getRunningThread().isAlive()) { while (this.getRunningThread().isAlive()) {
this.getRunningThread().stop(); this.getRunningThread().stop();
try { try {
@@ -1701,7 +1701,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa @@ -1702,7 +1702,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate @DontObfuscate
public String getServerModName() { public String getServerModName() {
@@ -113,7 +113,7 @@ index 24f767663b1190dcada3da554375e3a01064c462..f996609e8f478845f850daefc4e611e4
public SystemReport fillSystemReport(SystemReport details) { public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d182eac78879b5e124bb62aded8a405b327275b4..3fa7aaa5cb1758b0ed4aacaa6c27c6c1d69aafdd 100644 index 3fffeff2f7e12c021ac4d1e6754583f58a03f12f..7176b75dc2a574240e679d0164ec77c610ecba51 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper @@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper

16
patches/server/0002-feat-async-path-processing.patch
View File

@@ -723,7 +723,7 @@ index 27cd393e81f6ef9b5690c051624d8d2af50acd34..da870c729a8a4673d734e8704355ad1c
if (this.canUpdatePath()) { if (this.canUpdatePath()) {
this.followThePath(); this.followThePath();
diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
index f610c06d7bb51ec2c63863dd46711712986a106a..ff5f0788e1df9ea7a96a8fea475cc010d12e9772 100644 index f0248d839255763005ba333b0bfcf691407fb69b..f86adf5a8f5f2e720697956fdb0c7fd32f3fecf0 100644
--- a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java --- a/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/GroundPathNavigation.java
@@ -15,6 +15,15 @@ import net.minecraft.world.level.pathfinder.WalkNodeEvaluator; @@ -15,6 +15,15 @@ import net.minecraft.world.level.pathfinder.WalkNodeEvaluator;
@@ -752,10 +752,10 @@ index f610c06d7bb51ec2c63863dd46711712986a106a..ff5f0788e1df9ea7a96a8fea475cc010
@Override @Override
diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java diff --git a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
index efdd3069934e089863b07694e26b68ff567bd05b..eab95c7eae0bf9b448fb8edf50a5354d692b05ec 100644 index d4bb3b8ab9a8ba01cf9d27cf1417cb820c713057..3175b31bd40ec563a996891f08dba5b8fbe88543 100644
--- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java --- a/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
+++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java +++ b/src/main/java/net/minecraft/world/entity/ai/navigation/PathNavigation.java
@@ -151,6 +151,9 @@ public abstract class PathNavigation { @@ -150,6 +150,9 @@ public abstract class PathNavigation {
return null; return null;
} else if (!this.canUpdatePath()) { } else if (!this.canUpdatePath()) {
return null; return null;
@@ -765,7 +765,7 @@ index efdd3069934e089863b07694e26b68ff567bd05b..eab95c7eae0bf9b448fb8edf50a5354d
} else if (this.path != null && !this.path.isDone() && positions.contains(this.targetPos)) { } else if (this.path != null && !this.path.isDone() && positions.contains(this.targetPos)) {
return this.path; return this.path;
} else { } else {
@@ -177,11 +180,20 @@ public abstract class PathNavigation { @@ -176,11 +179,20 @@ public abstract class PathNavigation {
PathNavigationRegion pathNavigationRegion = new PathNavigationRegion(this.level, blockPos.offset(-i, -i, -i), blockPos.offset(i, i, i)); PathNavigationRegion pathNavigationRegion = new PathNavigationRegion(this.level, blockPos.offset(-i, -i, -i), blockPos.offset(i, i, i));
Path path = this.pathFinder.findPath(pathNavigationRegion, this.mob, positions, followRange, distance, this.maxVisitedNodesMultiplier); Path path = this.pathFinder.findPath(pathNavigationRegion, this.mob, positions, followRange, distance, this.maxVisitedNodesMultiplier);
//this.level.getProfiler().pop(); // Purpur //this.level.getProfiler().pop(); // Purpur
@@ -791,7 +791,7 @@ index efdd3069934e089863b07694e26b68ff567bd05b..eab95c7eae0bf9b448fb8edf50a5354d
return path; return path;
} }
@@ -228,8 +240,8 @@ public abstract class PathNavigation { @@ -227,8 +239,8 @@ public abstract class PathNavigation {
if (this.isDone()) { if (this.isDone()) {
return false; return false;
} else { } else {
@@ -802,7 +802,7 @@ index efdd3069934e089863b07694e26b68ff567bd05b..eab95c7eae0bf9b448fb8edf50a5354d
return false; return false;
} else { } else {
this.speedModifier = speed; this.speedModifier = speed;
@@ -253,6 +265,8 @@ public abstract class PathNavigation { @@ -252,6 +264,8 @@ public abstract class PathNavigation {
this.recomputePath(); this.recomputePath();
} }
@@ -811,7 +811,7 @@ index efdd3069934e089863b07694e26b68ff567bd05b..eab95c7eae0bf9b448fb8edf50a5354d
if (!this.isDone()) { if (!this.isDone()) {
if (this.canUpdatePath()) { if (this.canUpdatePath()) {
this.followThePath(); this.followThePath();
@@ -278,6 +292,7 @@ public abstract class PathNavigation { @@ -277,6 +291,7 @@ public abstract class PathNavigation {
} }
protected void followThePath() { protected void followThePath() {
@@ -819,7 +819,7 @@ index efdd3069934e089863b07694e26b68ff567bd05b..eab95c7eae0bf9b448fb8edf50a5354d
Vec3 vec3 = this.getTempMobPos(); Vec3 vec3 = this.getTempMobPos();
this.maxDistanceToWaypoint = this.mob.getBbWidth() > 0.75F ? this.mob.getBbWidth() / 2.0F : 0.75F - this.mob.getBbWidth() / 2.0F; this.maxDistanceToWaypoint = this.mob.getBbWidth() > 0.75F ? this.mob.getBbWidth() / 2.0F : 0.75F - this.mob.getBbWidth() / 2.0F;
Vec3i vec3i = this.path.getNextNodePos(); Vec3i vec3i = this.path.getNextNodePos();
@@ -440,7 +455,7 @@ public abstract class PathNavigation { @@ -439,7 +454,7 @@ public abstract class PathNavigation {
// Paper start // Paper start
public boolean isViableForPathRecalculationChecking() { public boolean isViableForPathRecalculationChecking() {
return !this.needsPathRecalculation() && return !this.needsPathRecalculation() &&

6
patches/server/0005-feat-reduce-sensor-work.patch
View File

@@ -7,7 +7,7 @@ this patch is focused around the sensors used for ai
delete the line of sight cache less often and use a faster nearby comparison delete the line of sight cache less often and use a faster nearby comparison
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index cd414a9275e6d9f8c704854763b18f4ee43b67b7..5e181f7a3126350310c564ca9501e97db2eef096 100644 index 260e094bad8d6f1b775e317ba2c9b3e25cfa7467..cd313f488ecb922c8ac1fefff285bd56c2d7de40 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1012,20 +1012,22 @@ public abstract class LivingEntity extends Entity { @@ -1012,20 +1012,22 @@ public abstract class LivingEntity extends Entity {
@@ -38,10 +38,10 @@ index cd414a9275e6d9f8c704854763b18f4ee43b67b7..5e181f7a3126350310c564ca9501e97d
// Purpur start // Purpur start
if (entity instanceof LivingEntity entityliving) { if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index b75243eca01cae108093368e426ea2d6b6ef1057..e8ef413abb0b771742591c513a070a41af35ec5d 100644 index ec4f04327eb875989af4d7da0171e2000fadef6b..b99c2710fa2f0e1d748fa16006113bfd913d17e9 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java --- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -878,10 +878,10 @@ public abstract class Mob extends LivingEntity { @@ -884,10 +884,10 @@ public abstract class Mob extends LivingEntity {
return; return;
} }
// Paper end // Paper end