Repo-Mirror/PetalMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

feat: Upstream

Browse Source
This commit is contained in:
peaches94
2022-11-29 18:23:59 -06:00
parent d4481707ac
commit cc691540fb
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@@ -4,7 +4,7 @@ import java.nio.charset.StandardCharsets
plugins {
java
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.3.8"
id("io.papermc.paperweight.patcher") version "1.3.9"
}
repositories {
@@ -15,7 +15,7 @@ repositories {
}
dependencies {
remapper("net.fabricmc:tiny-remapper:0.8.2:fat")
remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
decompiler("net.minecraftforge:forgeflower:1.5.605.7")
paperclip("io.papermc:paperclip:3.0.2")
}

2
gradle.properties
View File

@@ -5,4 +5,4 @@ org.gradle.vfs.watch=false
group=host.bloom.petal
version=1.19.2-R0.1-SNAPSHOT
mcVersion=1.19.2
purpurRef=0d5fd505e5a82ea9e9d8afb35f72c5c3e03a4a9b
purpurRef=afd4044046331919443aa0ae9b53ae197a95ba3b

10
patches/server/0001-conf-brand-server-to-petal.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] conf: brand server to petal
diff --git a/build.gradle.kts b/build.gradle.kts
index 2ee34f92e8a89b90448bbf710fdc0d5d6350e919..d7cd4c85a8775f979f62d5da7220a1be321743a6 100644
index 8ffc0d92ea29b95e5406ed81088ecf00e7679a97..6c93b36f1faa8758c86f33ab9f9fe9207c21d2fc 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
@@ -7,7 +7,7 @@ plugins {
}
dependencies {
@@ -17,7 +17,7 @@ index 2ee34f92e8a89b90448bbf710fdc0d5d6350e919..d7cd4c85a8775f979f62d5da7220a1be
// Pufferfish start
implementation("io.papermc.paper:paper-mojangapi:1.19.2-R0.1-SNAPSHOT") {
exclude("io.papermc.paper", "paper-api")
@@ -86,7 +86,7 @@ tasks.jar {
@@ -84,7 +84,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -84,7 +84,7 @@ index fba5dbdb7bcbb55400ef18342c9b54612972a718..3f9aa4292ff45c6b6af0ddfeecb645f8
switch (distance) {
case -1:
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 13c9cddf7ac0af16676050e3bcdf22b7475a0387..abc5a4a67270db2b801d02fe870e73b448fac9a7 100644
index 02ea949342380567448909ad82b4d701831a92bb..9302bd9c75011f395b7f7866f59a5a7122147051 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -926,7 +926,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -113,7 +113,7 @@ index 13c9cddf7ac0af16676050e3bcdf22b7475a0387..abc5a4a67270db2b801d02fe870e73b4
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f9508a26b2e764e752da3d2c9f43a9d7de19dd27..bad90335cfed68b2abdfd52003155270e284f5c0 100644
index ed7e59b4d573ea9124a086708ca84f755861c896..a05e74a74eaa7689656e2f13bbde992af226e404 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper

8
patches/server/0003-feat-multithreaded-tracker.patch
View File

@@ -202,7 +202,7 @@ index f597d65d56964297eeeed6c7e77703764178fee0..665c377e2d0d342f4dcc89c4cbdfcc9e
public ChunkHolder.FullChunkStatus status;
diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 2182ee049defee88067aa61cee42d3a0122061b7..73a625383d17d20f6ce1534b7f77b13dd51a480c 100644
index ceaa44e8fbf02aef36f5ae663269dfc1026e4086..71d9caa4dfb16ea58d13e3e8d165dae6c9a67176 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1236,8 +1236,37 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -299,10 +299,10 @@ index ca42c2642a729b90d22b968af7258f3aee72e14b..40261b80d947a6be43465013fae55321
public boolean visible = true;
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 3441339e1ba5efb0e25c16fa13cb65d2fbdafc42..555336cf6700566e8a99e0f0cd6f0cc41b6c5ba0 100644
index 7880cdcaf12197f6b36777c51b2859f2463f1595..281866d9fee4e2c544030eea135857b618e2ba57 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -249,14 +249,18 @@ public class ServerEntity {
@@ -250,14 +250,18 @@ public class ServerEntity {
public void removePairing(ServerPlayer player) {
this.entity.stopSeenByPlayer(player);
@@ -323,7 +323,7 @@ index 3441339e1ba5efb0e25c16fa13cb65d2fbdafc42..555336cf6700566e8a99e0f0cd6f0cc4
this.entity.startSeenByPlayer(player);
}
@@ -362,19 +366,30 @@ public class ServerEntity {
@@ -363,19 +367,30 @@ public class ServerEntity {
SynchedEntityData datawatcher = this.entity.getEntityData();
if (datawatcher.isDirty()) {

6
patches/server/0004-feat-reduce-work-done-by-game-event-system.patch
View File

@@ -8,10 +8,10 @@ Subject: [PATCH] feat: reduce work done by game event system
2. euclideangameeventdispatcher is not used concurrently so we ban that usage for improved performance with allays
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index c888e654ab9449bfdc7dfe16078eb0786ae6c15e..3448cba3b57296866d1f5d5cd5f008a8462d3b7d 100644
index 4921c791c7900210e6dd96e03256ea529fd1d03d..a3430ddde87a6c67ce32ae01846d8bf3753f33f6 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1705,6 +1705,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1707,6 +1707,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (chunk != null) {
for (int j2 = k; j2 <= j1; ++j2) {
flag |= chunk.getEventDispatcher(j2).walkListeners(event, emitterPos, emitter, (gameeventlistener, vec3d1) -> {
@@ -38,7 +38,7 @@ index 22c309343299e60ed8028229b7f134109001ff35..d5947d29295ddc93ba8ac1c0fc61f7ba
org.bukkit.craftbukkit.event.CraftEventFactory.sourceBlockOverride = blockEntity.getBlockPos(); // CraftBukkit - SPIGOT-7068: Add source block override, not the most elegant way but better than passing down a BlockPosition up to five methods deep.
blockEntity.sculkSpreader.updateCursors(world, pos, world.getRandom(), true);
diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
index 7bae0525cc48d531de5a949f038417e098a59443..2ca706d9d42721ca1b5c8cc959aead9ac93c481a 100644
index 2877441927de3aeba28f5c3dd876e2ae4c15797c..aae74715e9daa1c6a842c851cf14f5030d2f5efb 100644
--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
@@ -84,7 +84,18 @@ public class LevelChunk extends ChunkAccess {

6
patches/server/0005-feat-reduce-sensor-work.patch
View File

@@ -7,10 +7,10 @@ this patch is focused around the sensors used for ai
delete the line of sight cache less often and use a faster nearby comparison
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 1ec9a48f2f44f5bd647e0661423ae90970aee262..8800f2ab9e43a0377c1eae1f735bf3c5a09c8a36 100644
index f23829690d2be20af50256e4d985e3e342415d54..995fc228430ac6c8af8654aa1137c7f66668f622 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1011,20 +1011,22 @@ public abstract class LivingEntity extends Entity {
@@ -1026,20 +1026,22 @@ public abstract class LivingEntity extends Entity {
}
if (entity != null) {
@@ -38,7 +38,7 @@ index 1ec9a48f2f44f5bd647e0661423ae90970aee262..8800f2ab9e43a0377c1eae1f735bf3c5
// Purpur start
if (entity instanceof LivingEntity entityliving) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index d5e3bd662da349fc2ee58c7800d79c60300f33b3..0981873ee37fc839035b8398bac03d15adecb301 100644
index bc18c166ca776b0ef6e816eb034e410c391258b6..e68533ff29c882e955c150130e3260584cc250b0 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -884,10 +884,10 @@ public abstract class Mob extends LivingEntity {