Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

missed a few things during the update

Browse Source
This commit is contained in:
granny
2023-06-14 23:47:38 -07:00
parent 91bfaff5af
commit 2e5dcc63d3
6 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0272-Remove-Mojang-Profiler.patch
View File

@@ -39,7 +39,7 @@ index 5f6cc8b16af6dce3b74f0c2c662b0ecf84ae8d36..52b06c34d9d3ffb8844556e7b0eaed5a
return b0;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index dc70b971a37ef71e6c44dc6d3204ccfd60ce5b88..5fbf050a5f6a6c59089cb67e880f02f99844e384 100644
index 6f3074ff02039a5b7fd139d36f23d3d571c5b7bc..762028f25430013b2ae11caf76405cab681b1ab5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -341,13 +341,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1483,7 +1483,7 @@ index 51772f03a3469b11e7166ec6f3a1b9c64a606221..02f2f46ccc48bb4d9bd08555818b0489
this.seen.add(i);
} else {
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
index 801dde462d5ff785691157520270f6f20e1bd1b2..cff8d4a00d560ffac1a3b4b3d7dfaa9ff5fcd1d0 100644
index 6c2129b93dbeaeb1e8e8db58fce8670ef8ce5716..d50bf1b980231a1045c1c9df622a9a50fc2ed893 100644
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
@@ -260,13 +260,13 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@@ -1492,7 +1492,7 @@ index 801dde462d5ff785691157520270f6f20e1bd1b2..cff8d4a00d560ffac1a3b4b3d7dfaa9f
protected void customServerAiStep() {
- this.level().getProfiler().push("allayBrain");
+ //this.level().getProfiler().push("allayBrain"); // Purpur
if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
this.getBrain().tick((ServerLevel) this.level(), this);
- this.level().getProfiler().pop();
- this.level().getProfiler().push("allayActivityUpdate");
@@ -1505,7 +1505,7 @@ index 801dde462d5ff785691157520270f6f20e1bd1b2..cff8d4a00d560ffac1a3b4b3d7dfaa9f
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index 7ae53657d9c5be90fa2f92d0fb3dbcb78ed35abf..cb95571ad2119b8bad5bbba036ebaeb058fcc00f 100644
index 51b475191113cf3cae5e776b0dfbcd0236a92808..07abf72b7aed98652ac6639b26ade358fcd9135a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -325,13 +325,13 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@@ -1514,7 +1514,7 @@ index 7ae53657d9c5be90fa2f92d0fb3dbcb78ed35abf..cb95571ad2119b8bad5bbba036ebaeb0
protected void customServerAiStep() {
- this.level().getProfiler().push("axolotlBrain");
+ //this.level().getProfiler().push("axolotlBrain"); // Purpur
if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
this.getBrain().tick((ServerLevel) this.level(), this);
- this.level().getProfiler().pop();
- this.level().getProfiler().push("axolotlActivityUpdate");
@@ -1549,7 +1549,7 @@ index 8073a3a0df7d75a29419303c85d7dadd9f94be99..9f19ebfa6392a080672c472e08f75537
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
index c3b3b4ab424fab13b90cdff33f4909a8f4f3882d..2b4141bfed75edd6d2ec96ff5989009f174416fd 100644
index 840b61241c44e92b3053157492f4389f46179e81..dc1e8bcd8049d79c0e383ccd6a5697f79a3a2ebd 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java
@@ -218,13 +218,13 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
@@ -1558,7 +1558,7 @@ index c3b3b4ab424fab13b90cdff33f4909a8f4f3882d..2b4141bfed75edd6d2ec96ff5989009f
protected void customServerAiStep() {
- this.level().getProfiler().push("frogBrain");
+ //this.level().getProfiler().push("frogBrain"); // Purpur
if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
this.getBrain().tick((ServerLevel)this.level(), this);
- this.level().getProfiler().pop();
- this.level().getProfiler().push("frogActivityUpdate");
@@ -1571,7 +1571,7 @@ index c3b3b4ab424fab13b90cdff33f4909a8f4f3882d..2b4141bfed75edd6d2ec96ff5989009f
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
index 05545b399d068e5c88f4fcd2729e616222fe1e3a..98e3155b5d5d499a12122b9eb91cde22a72d2cad 100644
index af8438ae8c805d3276ef2d82eb39b08880fcc8a1..6b012bea26e8ef0c04571f43da67f6e108188830 100644
--- a/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
+++ b/src/main/java/net/minecraft/world/entity/animal/frog/Tadpole.java
@@ -117,13 +117,13 @@ public class Tadpole extends AbstractFish {
@@ -1580,7 +1580,7 @@ index 05545b399d068e5c88f4fcd2729e616222fe1e3a..98e3155b5d5d499a12122b9eb91cde22
protected void customServerAiStep() {
- this.level().getProfiler().push("tadpoleBrain");
+ //this.level().getProfiler().push("tadpoleBrain"); // Purpur
if (this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish
if ((getRider() == null || !this.isControllable()) && this.behaviorTick++ % this.activatedPriority == 0) // Pufferfish // Purpur - only use brain if no rider
this.getBrain().tick((ServerLevel) this.level(), this);
- this.level().getProfiler().pop();
- this.level().getProfiler().push("tadpoleActivityUpdate");