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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
6bf12bff7 Ensure POI removal occurs on the correct thread
6b3a6aefa Remove stale POIs
7cbd4ca19 Remove patch for not searching for portal creation when looking down (#5031)
This commit is contained in:
jmp
2021-01-09 11:54:56 -08:00
parent f74bcbd599
commit 9370140d7a
12 changed files with 22 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0039-Cat-spawning-options.patch
View File

@@ -17,7 +17,7 @@ index 0c98a436021cbdedba5352073b1f8bf9852298eb..08778cc0de9b1ffefc52d12d31403c33
return this.a(oclass, axisalignedbb, IEntitySelector.g);
}
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
index 5e17868a76ea8e3f105c11d496d6da12afa0da41..6d0ebd8afe690b3781917773419abe2856009769 100644
index 5e17868a76ea8e3f105c11d496d6da12afa0da41..5a0f8779672a9e34f6970045361630ab5af3990b 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
@@ -16,7 +16,7 @@ public class MobSpawnerCat implements MobSpawner {
@@ -40,7 +40,7 @@ index 5e17868a76ea8e3f105c11d496d6da12afa0da41..6d0ebd8afe690b3781917773419abe28
+ // Purpur start
+ int range = worldserver.purpurConfig.catSpawnVillageScanRange;
+ if (range <= 0) return 0;
+ if (worldserver.getVillagePlace().count(VillagePlaceType.home().predicate(), blockposition, range, VillagePlace.Occupancy.IS_OCCUPIED) > 4L) {
+ if (worldserver.getPoiStorage().count(VillagePlaceType.home().predicate(), blockposition, range, VillagePlace.Occupancy.IS_OCCUPIED) > 4L) {
+ List<EntityCat> list = worldserver.getEntitiesInAABB(EntityCat.class, (new AxisAlignedBB(blockposition)).grow(range, 8.0D, range));
+ // Purpur end
@@ -62,10 +62,10 @@ index 5e17868a76ea8e3f105c11d496d6da12afa0da41..6d0ebd8afe690b3781917773419abe28
}
diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
index 99778f80c0f6c2e15cc3b8298dc0bbc5493f3e83..be2ff3547c76584f42ff532f67526595f4a66209 100644
index 731a7b52c1c659b3b985704dea9cf57f6c5bcecb..fd32be3362ef88d903fd49ff8fa90c1bb762d9ec 100644
--- a/src/main/java/net/minecraft/server/VillagePlace.java
+++ b/src/main/java/net/minecraft/server/VillagePlace.java
@@ -177,6 +177,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -178,6 +178,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
((VillagePlaceSection) this.e(SectionPosition.a(blockposition).s())).a(blockposition);
}
@@ -94,18 +94,6 @@ index a5718af9b614ae505067131f04ebb490617d6aa4..b6b4c8c491d692f93d2c38d602ff99b0
public Predicate<VillagePlaceType> c() {
return this.E;
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index a4296f150d196b12a6e95730ac2b8c43412cc01a..5db25b05565be541f07993092ba8e67c32d7cb18 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -2506,6 +2506,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
}
+ public VillagePlace getVillagePlace() { return y(); } // Purpur - OBFHELPER
public VillagePlace y() {
return this.getChunkProvider().j();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0fa01267fa35f1afdc81c2636f9efa8506bcebb6..9c5de125a6ed207f238dff1e17e38a4083c4c251 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java