Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.18.2

Browse Source
This commit is contained in:
BillyGalbreath
2022-03-01 17:27:08 -06:00
parent 133b3e1719
commit 90adb4e4af
192 changed files with 1500 additions and 1550 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0264-Lobotomize-stuck-villagers.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lobotomize stuck villagers
diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
index b9f228d660b2279284e64fc3bbfa90fc7d2d20b0..3cf27428820e9cd96cd54abe3bfc80d9e6bbf96a 100644
index 59bfaf90d448223c5aee9b18d2915539f54f0d4b..b5db8212aa6b20fbaa8ea7dbcd14c9cc13460fe0 100644
--- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
@@ -138,6 +138,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -140,6 +140,8 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
return villageplacetype == PoiType.MEETING;
});
private final int brainTickOffset; // Purpur
@@ -17,7 +17,7 @@ index b9f228d660b2279284e64fc3bbfa90fc7d2d20b0..3cf27428820e9cd96cd54abe3bfc80d9
public long nextGolemPanic = -1; // Pufferfish
@@ -196,6 +198,47 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -198,6 +200,47 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
protected boolean isAlwaysExperienceDropper() {
return this.level.purpurConfig.villagerAlwaysDropExp;
}
@@ -65,7 +65,7 @@ index b9f228d660b2279284e64fc3bbfa90fc7d2d20b0..3cf27428820e9cd96cd54abe3bfc80d9
// Purpur end
@Override
@@ -293,6 +336,15 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -295,6 +338,15 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
protected void customServerAiStep() { mobTick(false); }
protected void mobTick(boolean inactive) {
this.level.getProfiler().push("villagerBrain");
@@ -81,7 +81,7 @@ index b9f228d660b2279284e64fc3bbfa90fc7d2d20b0..3cf27428820e9cd96cd54abe3bfc80d9
// Pufferfish start
if (!inactive) {
// Purpur start
@@ -303,6 +355,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -305,6 +357,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
this.getBrain().tick((ServerLevel) this.level, this); // Paper
}
// Pufferfish end