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

Updated Upstream (Paper & Pufferfish)

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

Paper Changes:
PaperMC/Paper@ec3cfa9 Only create paper.yml-README.txt on config conversion (#8334)
PaperMC/Paper@928bcc8 Updated Upstream (Bukkit/CraftBukkit) (#8430)
PaperMC/Paper@616db71 Fix nothing mlg (#8432)
PaperMC/Paper@011caa4 [ci skip] Minor patch cleanup
PaperMC/Paper@15e1748 Avoid resizing of ArrayList in ChunkMap#getPlayers (#8416)
PaperMC/Paper@ad3d357 Remove unnecessary onTrackingStart during nav warning
PaperMC/Paper@9d63b07 Fix custom piglin interest items (#8097)
PaperMC/Paper@ff67f1f EntityPickupItemEvent fixes (#8096)

Pufferfish Changes:
pufferfish-gg/Pufferfish@08aeb1a Updated Upstream (Paper)
pufferfish-gg/Pufferfish@58865aa Updated Upstream (Paper)
pufferfish-gg/Pufferfish@d960687 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@9d9a0e1 Update snakeyaml dependency
This commit is contained in:
BillyGalbreath
2022-10-05 04:26:13 -05:00
parent b54122adf4
commit f5ae75874a
31 changed files with 140 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts
index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..0485d126f799789b5d5abcaf96da96df25a12dfd 100644
index 44e0f265432487fe5c3c00c5245041298ade16a0..e775602d55dc6eade0f90a96b5d84595bb9dfdb8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,8 +9,12 @@ plugins {
@@ -43,8 +43,8 @@ index 2374cc9bab5039d0a0dc11d4b2ec573ab75778a7..0485d126f799789b5d5abcaf96da96df
runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3")
+ // Pufferfish start
+ implementation("org.yaml:snakeyaml:1.30")
+ implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8") {
+ implementation("org.yaml:snakeyaml:1.32")
+ implementation ("me.carleslc.Simple-YAML:Simple-Yaml:1.8.2") {
+ exclude(group="org.yaml", module="snakeyaml")
+ }
+ // Pufferfish end
@@ -1524,7 +1524,7 @@ index 2932d2bb797a49e904cebec4285d24d69b429cd9..d4efadbc87ee0b6cb8564c57fc9dcbb4
}
}
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 5461bac37b6dc0575cccd6656b48b2ef18cfaa04..9ac645e08275bb7943dd1edcd635c179c0620d89 100644
index 73daa8368066e20d251b8b6eb69c916919b48838..ae68af5f3498325e5686eb311faad559647bb348 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -334,7 +334,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1536,7 +1536,7 @@ index 5461bac37b6dc0575cccd6656b48b2ef18cfaa04..9ac645e08275bb7943dd1edcd635c179
// Paper start - use distance map to optimise entity tracker
this.playerEntityTrackerTrackMaps = new com.destroystokyo.paper.util.misc.PlayerAreaMap[TRACKING_RANGE_TYPES.length];
this.entityTrackerTrackRanges = new int[TRACKING_RANGE_TYPES.length];
@@ -1592,8 +1592,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1590,8 +1590,28 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
return ChunkMap.this.level.getServer().getScaledTrackingDistance(initialDistance);
}
@@ -1565,7 +1565,7 @@ index 5461bac37b6dc0575cccd6656b48b2ef18cfaa04..9ac645e08275bb7943dd1edcd635c179
Iterator iterator = this.entity.getIndirectPassengers().iterator();
while (iterator.hasNext()) {
@@ -1605,6 +1625,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1603,6 +1623,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
i = j;
}
}
@@ -1692,7 +1692,7 @@ index 3b144c820531122eb37d41be06c182b5f5dc0724..1eb912ad97f9663bf6bd336ad739f255
this.wasOnGround = this.entity.isOnGround();
this.teleportDelay = 0;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index b396e9b35f315db37ba070ad4baeec1f098d0cb8..f8750675044708e71dbf6293be6ce36bd6c510ca 100644
index f1a27e0ea0569438032ff6c5a777a35be4e501ef..917cf327f3f9d824ec0da70fd9204624e7cf96fb 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -725,7 +725,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1749,7 +1749,7 @@ index b396e9b35f315db37ba070ad4baeec1f098d0cb8..f8750675044708e71dbf6293be6ce36b
this.getRandomBlockPosition(j, 0, k, 15, blockposition);
int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 9eb921fec32afa360f3a402e978411fcf3ec618c..cc55cb14f2d0f656213be25a1e428132871ac5dd 100644
index 63c9040ed2349eec500ba6e9090440347c514a3b..59608a53bbf0eccf118b4d65557444f6532fedb4 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1216,6 +1216,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1760,7 +1760,7 @@ index 9eb921fec32afa360f3a402e978411fcf3ec618c..cc55cb14f2d0f656213be25a1e428132
// Paper start
if (!this.cserver.isPrimaryThread()) {
List<String> pageList = packet.getPages();
@@ -2363,6 +2364,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2364,6 +2365,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
private boolean updateChatOrder(Instant timestamp) {
@@ -2074,7 +2074,7 @@ index 008bd65d838819431a0823c6ac5925774bd155a1..fc4bd8ad4836aa6bdd228885f0aeb225
if (vec3d.length() > 0.0D) {
if (k1 > 0) {
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index ac0f0a4da4282c13f6e1f37710cb615d66b8ef2c..ec0319dd4b115e18b368027cc5dbe4d4d9c64840 100644
index 12cf4d3dfbd2c4f4a1815f5e26e59ae8667f7b47..bbe9568b8df69f5f1ef08dc02dc8ee6a5c63f13c 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -305,6 +305,8 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
@@ -2087,7 +2087,7 @@ index ac0f0a4da4282c13f6e1f37710cb615d66b8ef2c..ec0319dd4b115e18b368027cc5dbe4d4
public final String id;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 1c8661afcfaaf56953cef3a5c26fbc4fa3ac5b1c..ded69bc892aaf35cc57a562116bb623c07b08550 100644
index 0318c9483a4d96eb39ff4df9054a9e6398186bc3..26efc49b4530112c8bd3f580ce375ab4203c9609 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -2124,7 +2124,7 @@ index 1c8661afcfaaf56953cef3a5c26fbc4fa3ac5b1c..ded69bc892aaf35cc57a562116bb623c
@Override
public boolean hurt(DamageSource source, float amount) {
if (this.isInvulnerableTo(source)) {
@@ -1903,6 +1910,20 @@ public abstract class LivingEntity extends Entity {
@@ -1906,6 +1913,20 @@ public abstract class LivingEntity extends Entity {
return this.lastClimbablePos;
}
@@ -2145,7 +2145,7 @@ index 1c8661afcfaaf56953cef3a5c26fbc4fa3ac5b1c..ded69bc892aaf35cc57a562116bb623c
public boolean onClimbable() {
if (this.isSpectator()) {
return false;
@@ -3583,7 +3604,10 @@ public abstract class LivingEntity extends Entity {
@@ -3586,7 +3607,10 @@ public abstract class LivingEntity extends Entity {
Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ());
// Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists
@@ -2158,7 +2158,7 @@ index 1c8661afcfaaf56953cef3a5c26fbc4fa3ac5b1c..ded69bc892aaf35cc57a562116bb623c
}
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 557e90e54439ce0430075403392b5052d5181feb..5ab1f5d36a61e7a7fe8da4e74f75963ea6432101 100644
index fffa6ba329b38433a1df51df339df652d3fda828..e89b88eb3d4202ea7ff043dc9e92163332cd10d3 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -210,14 +210,16 @@ public abstract class Mob extends LivingEntity {
@@ -2409,7 +2409,7 @@ index 3dd4e6d622a6daafa00ae971edd88a147e34beef..32cca29fd622d18030931e1f33079149
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 31be36e6b7b6bd0c0d7fda4e1b03ecd38947f3a5..362f952888f63a453a4352a9f1dc7df799244a3c 100644
index a4690391df0aa26abea1ad92e6143eb19c5d1143..3c3453638e117609190787efbf5d87fc20dcf8fd 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -163,9 +163,11 @@ public class Goat extends Animal {
@@ -2486,7 +2486,7 @@ index 45741410a13cffe3419e34b5607b048bbcf1c3ff..5d487f1613b1fc5807283c20e5cc23a4
this.level.getProfiler().pop();
HoglinAi.updateActivity(this);
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
index 793576928dad6752dddd86e62d4c0800d8515fc4..9bde52b723237b1f0f945bc564009e3507993508 100644
index abeb7285dc0d1e6687feaae8be2dbde1d61b7f11..23547da37a4178a32775285a1d697c369a7ffcd2 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
@@ -289,9 +289,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -2952,10 +2952,10 @@ index d89471935b2b5888cb5d1f6829ae479003451fda..0277633fd328ef9993fea4ac29df83b5
}
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index e31a2eea9a62ab2c0bed1a97dab6bae231b8cd8b..1f4acc1a2605f1e9051126fc811a5479351fc61a 100644
index df83b6f0e217eec4c9e9707be0030c129fdeb545..386ed2c102aaa3ec68e828e20fff6bfe0d8f7877 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -414,12 +414,12 @@ public final class NaturalSpawner {
@@ -415,12 +415,12 @@ public final class NaturalSpawner {
}
}