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

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;