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

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

2
Paper

Submodule Paper updated: 97b2eadf17...6bf12bff71

16
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -14521,7 +14521,7 @@ index 7f05587d42b7cdb09552277ec2e467f0edf06f10..5af554870bcf36e47aef43b966b141b9
return this.x * this.x + this.y * this.y + this.z * this.z;
}
diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
index b926cebd053bef829517c9d9bbf1c609c23ca04a..99778f80c0f6c2e15cc3b8298dc0bbc5493f3e83 100644
index 6a0f07b13eef5560dfc7c7b39618c0b825533aec..731a7b52c1c659b3b985704dea9cf57f6c5bcecb 100644
--- a/src/main/java/net/minecraft/server/VillagePlace.java
+++ b/src/main/java/net/minecraft/server/VillagePlace.java
@@ -4,6 +4,7 @@ import com.mojang.datafixers.DataFixer;
@@ -14684,7 +14684,7 @@ index b926cebd053bef829517c9d9bbf1c609c23ca04a..99778f80c0f6c2e15cc3b8298dc0bbc5
public void a(BlockPosition blockposition, VillagePlaceType villageplacetype) {
((VillagePlaceSection) this.e(SectionPosition.a(blockposition).s())).a(blockposition, villageplacetype);
}
@@ -138,10 +270,11 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -140,10 +272,11 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
}
public int a(SectionPosition sectionposition) {
@@ -14698,7 +14698,7 @@ index b926cebd053bef829517c9d9bbf1c609c23ca04a..99778f80c0f6c2e15cc3b8298dc0bbc5
private boolean f(long i) {
Optional<VillagePlaceSection> optional = this.c(i);
@@ -157,7 +290,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -159,7 +292,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
super.a(booleansupplier);
} else {
//super.a(booleansupplier); // re-implement below
@@ -14707,7 +14707,7 @@ index b926cebd053bef829517c9d9bbf1c609c23ca04a..99778f80c0f6c2e15cc3b8298dc0bbc5
ChunkCoordIntPair chunkcoordintpair = SectionPosition.a(((RegionFileSection)this).d.firstLong()).r();
NBTTagCompound data;
@@ -165,22 +298,27 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -167,22 +300,27 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
data = this.getData(chunkcoordintpair);
}
com.destroystokyo.paper.io.PaperFileIOThread.Holder.INSTANCE.scheduleSave(this.world,
@@ -14739,7 +14739,7 @@ index b926cebd053bef829517c9d9bbf1c609c23ca04a..99778f80c0f6c2e15cc3b8298dc0bbc5
}
public void a(ChunkCoordIntPair chunkcoordintpair, ChunkSection chunksection) {
@@ -245,7 +383,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -247,7 +385,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@Override
protected int b(long i) {
@@ -14748,7 +14748,7 @@ index b926cebd053bef829517c9d9bbf1c609c23ca04a..99778f80c0f6c2e15cc3b8298dc0bbc5
}
@Override
@@ -290,7 +428,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -292,7 +430,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
if (this.world != null && Thread.currentThread() != com.destroystokyo.paper.io.PaperFileIOThread.Holder.INSTANCE) {
com.destroystokyo.paper.io.PaperFileIOThread.Holder.INSTANCE.scheduleSave(
this.world, chunkcoordintpair.x, chunkcoordintpair.z, nbttagcompound, null,
@@ -14757,7 +14757,7 @@ index b926cebd053bef829517c9d9bbf1c609c23ca04a..99778f80c0f6c2e15cc3b8298dc0bbc5
return;
}
super.write(chunkcoordintpair, nbttagcompound);
@@ -309,6 +447,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -311,6 +449,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
this.d = predicate;
}
@@ -15542,7 +15542,7 @@ index f011869880fedae4b69e505491e8bdbc5f51dfba..0d10d317cd0b60fc0866ae505c7fd71f
return this.j.d();
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 5b0b6edfa790918e56399ff6c83f3feb6e5aca49..ff1d80c7c3271a18fa355430417dd1992b8494a8 100644
index b033ff44373ec87702946c3cefe664fb46d609f4..72452abfe1fa8eafac386e0f2e5d87296772675a 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -55,12 +55,13 @@ import org.bukkit.event.server.MapInitializeEvent;

2
patches/server/0009-AFK-API.patch
View File

@@ -193,7 +193,7 @@ index 5c708ed2cd3b10744b0d6d2eb2ef51d0411ce0dc..d1d4f4baf33e6b2224116f22a63b6d21
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index ff1d80c7c3271a18fa355430417dd1992b8494a8..9d4181179760140c88cda25f8082d9b682814772 100644
index 72452abfe1fa8eafac386e0f2e5d87296772675a..6e34a58dd40785337b16c07e4f76566cd306db7e 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -781,7 +781,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0017-EntityMoveEvent.patch
View File

@@ -42,7 +42,7 @@ index 3ac30bbf7ad327372b02ed365572fd3226fb6f9a..de72f058b6de539ff75858120d6d023e
this.methodProfiler.a(() -> {
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 9d4181179760140c88cda25f8082d9b682814772..fedf4d31eebc040e4c3970d5bc1c777726ad8e7a 100644
index 6e34a58dd40785337b16c07e4f76566cd306db7e..f8a4f95f1568091fea44663d33daa06780c2a2b8 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -101,6 +101,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0029-Zombie-horse-naturally-spawn.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index fedf4d31eebc040e4c3970d5bc1c777726ad8e7a..a4296f150d196b12a6e95730ac2b8c43412cc01a 100644
index f8a4f95f1568091fea44663d33daa06780c2a2b8..5ddb374c8eb7668bf4daeb516bedf351415a79f6 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -996,12 +996,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {

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

2
patches/server/0040-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] MC-147659 - Fix non black cats spawning in swamp huts
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
index 6d0ebd8afe690b3781917773419abe2856009769..c7a78700746384fb41e24e577022b3d3c9c4c9f6 100644
index 5a0f8779672a9e34f6970045361630ab5af3990b..25bb494350cd771166a78a7b14726cee8f01b02e 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
@@ -80,8 +80,9 @@ public class MobSpawnerCat implements MobSpawner {

2
patches/server/0105-Add-no-tick-block-list.patch
View File

@@ -22,7 +22,7 @@ index 829d4a7508e1656dbdc912096b7eafcf30cbb5b2..6aea156d7c7a9ca8a357aad6a6781d72
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 5db25b05565be541f07993092ba8e67c32d7cb18..44942f73c98e28821ee9d899733f44f45762b02c 100644
index 5ddb374c8eb7668bf4daeb516bedf351415a79f6..49f15f76d008ac59862994a3577962d6747d89ae 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -321,14 +321,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0109-Ridables.patch
View File

@@ -5041,7 +5041,7 @@ index 70870b0af64ff9cac7a211cce7cc6ab2497a62ea..b91f3efb61575869d54d630263bb6a4c
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 44942f73c98e28821ee9d899733f44f45762b02c..d5f1808b232869ed5db8161345a03bf79fd159b7 100644
index 49f15f76d008ac59862994a3577962d6747d89ae..f34855683eb2fae8f46e3915f6dff2e585f82a1d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -102,6 +102,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0115-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -42,7 +42,7 @@ index b91f3efb61575869d54d630263bb6a4c6499153e..22a5a212b8f0a223a338a8476d9fc7fd
this.generator = gen;
this.world = new CraftWorld((WorldServer) this, gen, env);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d5f1808b232869ed5db8161345a03bf79fd159b7..78259bbb90fbd46bfd7922b9844339ff0a4c0342 100644
index f34855683eb2fae8f46e3915f6dff2e585f82a1d..7c35edeca619a25c975baf73ffc8e4b561e14db0 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -339,7 +339,24 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
patches/server/0125-Configurable-daylight-cycle.patch
View File

@@ -18,7 +18,7 @@ index 1b9b43ee696575d986c25cafec07d863acb951a7..e837db171545ceacbc84a2b360cf0d95
public PacketPlayOutUpdateTime() {}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 78259bbb90fbd46bfd7922b9844339ff0a4c0342..98d7686b15bbd5f75676e4391a241d5955f1c5e5 100644
index 7c35edeca619a25c975baf73ffc8e4b561e14db0..a1ac7c5ee47a26229f2e13016cd21974bd97df82 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -94,6 +94,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

15
patches/server/0164-Fix-rotating-UP-DOWN-CW-and-CCW.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix rotating UP/DOWN CW and CCW
diff --git a/src/main/java/net/minecraft/server/BlockFireAbstract.java b/src/main/java/net/minecraft/server/BlockFireAbstract.java
index 392d27916b929881ff05f94325184acc6f0d7b7a..172e4b3eeecc3808a335b80bb44bc6be3d8dd33d 100644
index 9c42b5df5839ed1759391270bcc6f240388ddd04..172e4b3eeecc3808a335b80bb44bc6be3d8dd33d 100644
--- a/src/main/java/net/minecraft/server/BlockFireAbstract.java
+++ b/src/main/java/net/minecraft/server/BlockFireAbstract.java
@@ -93,12 +93,6 @@ public abstract class BlockFireAbstract extends Block {
@@ -21,19 +21,6 @@ index 392d27916b929881ff05f94325184acc6f0d7b7a..172e4b3eeecc3808a335b80bb44bc6be
if (!a(world)) {
return false;
} else {
@@ -115,11 +109,7 @@ public abstract class BlockFireAbstract extends Block {
break;
}
}
- // Paper start - don't search for portal creation when looking down
- if(enumdirection == EnumDirection.DOWN || enumdirection == EnumDirection.UP) {
- return false;
- }
- // Paper end
+
return flag && BlockPortalShape.a((GeneratorAccess) world, blockposition, enumdirection.h().n()).isPresent();
}
}
diff --git a/src/main/java/net/minecraft/server/EnumDirection.java b/src/main/java/net/minecraft/server/EnumDirection.java
index e3ba447eb7f3023406b71aab97e3d30523540588..83366996a0f9ae4684cc5424ace7630cc72b75f7 100644
--- a/src/main/java/net/minecraft/server/EnumDirection.java