Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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

11
patches/server/0003-Rebrand.patch
View File

@@ -177,18 +177,9 @@ index abe37c7c3c6f5ab73afd738ec78f06d7e4d2ed96..b5b6657e52e4f7a630229bd3ba433438
stringbuilder.append(CrashReport.getErrorComment());
stringbuilder.append("\n\n");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 55d5e325006d5a948b98451b1e455bb8bb869cbb..73951d1456584d6e0938b3dec5a10eb79ad75e19 100644
index 55d5e325006d5a948b98451b1e455bb8bb869cbb..cdf213b991b61f67604ef7390c089399bc1b5dd5 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -311,7 +311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
public volatile Thread shutdownThread; // Paper
public volatile boolean abnormalExit = false; // Paper
public boolean isIteratingOverLevels = false; // Paper
-
+
public gg.pufferfish.pufferfish.util.AsyncExecutor mobSpawnExecutor = new gg.pufferfish.pufferfish.util.AsyncExecutor("MobSpawning"); // Pufferfish - optimize mob spawning
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
@@ -923,7 +923,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
shutdownThread = Thread.currentThread();
org.spigotmc.WatchdogThread.doStop(); // Paper

46
patches/server/0008-Ridables.patch
View File

@@ -22,7 +22,7 @@ index 83cab746d1d6fe25c043c8aee28c39412b90c127..ec6b58dae525c81bbb1c0e2d96fbded6
super(x, y, z);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 73951d1456584d6e0938b3dec5a10eb79ad75e19..a4cc0f1ab0fc138c22b9472ce8d3d6ad7561a7df 100644
index cdf213b991b61f67604ef7390c089399bc1b5dd5..a3816d42dd0209e30a286d679ef71e61901b655f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1526,6 +1526,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2142,7 +2142,7 @@ index 27c4dd3605373f08078048fe923a8f6f4d3ccf3b..cb2b8c7cbbe882ae0ca876edaa66bea1
this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers());
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 1a0eee3b766a5ce5623c32ed9c023a0f80db1d1a..801dde462d5ff785691157520270f6f20e1bd1b2 100644
index 1a0eee3b766a5ce5623c32ed9c023a0f80db1d1a..6c2129b93dbeaeb1e8e8db58fce8670ef8ce5716 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
@@ -101,10 +101,23 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@@ -2199,8 +2199,17 @@ index 1a0eee3b766a5ce5623c32ed9c023a0f80db1d1a..801dde462d5ff785691157520270f6f2
@Override
protected Brain.Provider<Allay> brainProvider() {
return Brain.provider(Allay.MEMORY_TYPES, Allay.SENSOR_TYPES);
@@ -226,7 +261,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
@Override
protected void customServerAiStep() {
this.level().getProfiler().push("allayBrain");
- 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");
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 42e22a4b9cb6841de04862cc81454da3232aa65a..943bd1f270e7e355840dd3b07151c0e5ba9492e4 100644
index 42e22a4b9cb6841de04862cc81454da3232aa65a..b76bead9c107889e9b2f11bdc24ad7da811f97ed 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
@@ -98,6 +98,23 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@@ -2227,6 +2236,15 @@ index 42e22a4b9cb6841de04862cc81454da3232aa65a..943bd1f270e7e355840dd3b07151c0e5
@Override
public Map<String, Vector3f> getModelRotationValues() {
return this.modelRotationValues;
@@ -289,7 +306,7 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@Override
protected void customServerAiStep() {
this.level().getProfiler().push("axolotlBrain");
- 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");
@@ -521,14 +538,22 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
private static class AxolotlMoveControl extends SmoothSwimmingMoveControl {
@@ -2281,7 +2299,7 @@ index 4efa7e331cc974008c653a04687a336e97626445..76a38d235de3499ca19c3ccacd9289c7
public void addAdditionalSaveData(CompoundTag nbt) {
super.addAdditionalSaveData(nbt);
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 80ddb3059d6484c2b90c55ef601043798f1a4b50..a5fa0cd8c87d8caa836378393ca10ea81ab8ff31 100644
index 80ddb3059d6484c2b90c55ef601043798f1a4b50..f189e0493286d58fbe16a30912b3a1dc4cd4c3e5 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
@@ -77,16 +77,65 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
@@ -2351,6 +2369,15 @@ index 80ddb3059d6484c2b90c55ef601043798f1a4b50..a5fa0cd8c87d8caa836378393ca10ea8
@Override
protected Brain.Provider<Frog> brainProvider() {
return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
@@ -166,7 +215,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
@Override
protected void customServerAiStep() {
this.level().getProfiler().push("frogBrain");
- 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");
@@ -347,7 +396,7 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {
return world.getBlockState(pos.below()).is(BlockTags.FROGS_SPAWNABLE_ON) && isBrightEnoughToSpawn(world, pos);
}
@@ -2361,7 +2388,7 @@ index 80ddb3059d6484c2b90c55ef601043798f1a4b50..a5fa0cd8c87d8caa836378393ca10ea8
super(entity);
}
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 6ed4ac06c76b8d0d6e8db778cade15dbd1e3e5f5..05545b399d068e5c88f4fcd2729e616222fe1e3a 100644
index 6ed4ac06c76b8d0d6e8db778cade15dbd1e3e5f5..af8438ae8c805d3276ef2d82eb39b08880fcc8a1 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
@@ -45,13 +45,50 @@ public class Tadpole extends AbstractFish {
@@ -2416,6 +2443,15 @@ index 6ed4ac06c76b8d0d6e8db778cade15dbd1e3e5f5..05545b399d068e5c88f4fcd2729e6162
@Override
protected PathNavigation createNavigation(Level world) {
return new WaterBoundPathNavigation(this, world);
@@ -81,7 +118,7 @@ public class Tadpole extends AbstractFish {
@Override
protected void customServerAiStep() {
this.level().getProfiler().push("tadpoleBrain");
- 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");
diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
index 2c7193e967b4cb5a7c98a760286a2c3791152359..1d9e2c93fa08d6f2f16b81021477294a6de3ce04 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java

8
patches/server/0104-Make-entity-breeding-times-configurable.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Wed, 14 Jun 2023 22:36:44 -0700
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sun, 15 Nov 2020 02:18:15 -0800
Subject: [PATCH] Make entity breeding times configurable
@@ -300,7 +300,7 @@ index c9ad084ce93eb618261221c7e19450c06fb8a5f5..074f1860e755348a5a3a8e9df3838966
protected void registerGoals() {
this.goalSelector.addGoal(1, new FloatGoal(this));
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 203aa1a885ab5d1770ac93f5346af27a9a47dbe8..5362778888890e43bcd4f6f8d68fcfbce22db966 100644
index e1c0c122dde56b8dd797d1278340260150025cf9..acf44bf3d22d7b2ac7a02b3167cf577403942908 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
@@ -120,6 +120,11 @@ public class Axolotl extends Animal implements LerpingModel, VariantHolder<Axolo
@@ -331,7 +331,7 @@ index 5ec8815cc69f5abe03a29224650edfb153c9f5d0..8073a3a0df7d75a29419303c85d7dadd
@Override
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 a5fa0cd8c87d8caa836378393ca10ea81ab8ff31..c3b3b4ab424fab13b90cdff33f4909a8f4f3882d 100644
index f189e0493286d58fbe16a30912b3a1dc4cd4c3e5..840b61241c44e92b3053157492f4389f46179e81 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
@@ -136,6 +136,10 @@ public class Frog extends Animal implements VariantHolder<FrogVariant> {

4
patches/server/0208-Conduit-behavior-configuration.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Fri, 9 Jun 2023 04:12:23 -0700
From: Encode42 <me@encode42.dev>
Date: Sun, 8 Aug 2021 18:14:31 -0400
Subject: [PATCH] Conduit behavior configuration

4
patches/server/0209-Cauldron-fill-chances.patch
View File

@@ -1,6 +1,6 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Fri, 9 Jun 2023 04:13:39 -0700
From: Encode42 <me@encode42.dev>
Date: Sun, 8 Aug 2021 18:38:44 -0400
Subject: [PATCH] Cauldron fill chances

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");