Update Paper

This commit is contained in:
Telesphoreo 2023-06-02 20:34:58 -05:00
parent 15efff8ce2
commit f64bb8faef
6 changed files with 13 additions and 13 deletions

View File

@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
version=1.19.4-R0.1-SNAPSHOT
mcVersion=1.19.4
paperRef=f9f90791e43f396ed12be5e0e8867691fc87dbe7
paperRef=bacbf86ed272f73f8b2979106589d80d8d70b83b
org.gradle.caching=true
org.gradle.parallel=true

View File

@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 9cf389defdaeb887e9cad4f0fed3f3b95667b238..e92a7dd91f4b4771d8087a5fbeed225938da0ef8 100644
index 4f2fa65ade89c5703451dad4f80eeef162b277d1..9c1dc30f351b62bf7f527afed9da0021b4234aaf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,10 @@ plugins {
@ -64,10 +64,10 @@ index 9f15d9dbdfa74a0640b1a2b4ff695609d4758a4c..c048169628a53462baf2e41813645971
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 e769f7b0904814ee63e2a73dca57e5dc33382fba..73e9be92c44ca7ae72d532e6f23d1f1c3504b35d 100644
index 894c0d5bfa001def4374b657e3eb8f15a0caa1e9..c01ee74990fec960c7952a6b4482e2d449a6874e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -257,7 +257,7 @@ import javax.annotation.Nullable; // Paper
@@ -259,7 +259,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {

View File

@ -110,10 +110,10 @@ index 97a2657bc98d41c3c1e376b266d2c85f685acc88..7b6476455e095eed15c92797ce3a3e11
}
}).reduce((accumulator, current) -> {
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index df316ca580a0a3b4ba6b658f7d7bdf542f4ad85b..234362618f40a91509deb1d4d7f537d86a68df77 100644
index 280ee1838106201f5e3ba7753caced6d030f7e55..ade4ed2f219d32050a372283eaebe75f9014ec78 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2353,12 +2353,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2354,12 +2354,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.setRot(this.getYRot(), this.getXRot());
if (nbt.contains("CustomName", 8)) {
String s = nbt.getString("CustomName");

View File

@ -663,10 +663,10 @@ index 4da4edae517a0efec6e03a719ec47b700509dab1..837b20be528bc33f62c0c675d90afebd
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 73e9be92c44ca7ae72d532e6f23d1f1c3504b35d..70f3448929acdb44d18187357402c5fd22aed189 100644
index c01ee74990fec960c7952a6b4482e2d449a6874e..3b2299cbfa3d1ffe89b4eefafd69bac1fb0b522d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -956,6 +956,7 @@ public final class CraftServer implements Server {
@@ -958,6 +958,7 @@ public final class CraftServer implements Server {
}
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
@ -674,7 +674,7 @@ index 73e9be92c44ca7ae72d532e6f23d1f1c3504b35d..70f3448929acdb44d18187357402c5fd
this.console.paperConfigurations.reloadConfigs(this.console);
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
@@ -987,6 +988,7 @@ public final class CraftServer implements Server {
@@ -989,6 +990,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
@ -682,7 +682,7 @@ index 73e9be92c44ca7ae72d532e6f23d1f1c3504b35d..70f3448929acdb44d18187357402c5fd
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2741,6 +2743,12 @@ public final class CraftServer implements Server {
@@ -2743,6 +2745,12 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

View File

@ -5,10 +5,10 @@ Subject: [PATCH] Patch invalid entity rotation log spam
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 234362618f40a91509deb1d4d7f537d86a68df77..127373f731fa3a15fe501a97887275166ea6ce30 100644
index ade4ed2f219d32050a372283eaebe75f9014ec78..deb54926662b2872f40d688db2756faadbf6aa6e 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4481,7 +4481,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4482,7 +4482,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public void setYRot(float yaw) {
if (!Float.isFinite(yaw)) {
@ -19,7 +19,7 @@ index 234362618f40a91509deb1d4d7f537d86a68df77..127373f731fa3a15fe501a9788727516
} else {
this.yRot = yaw;
}
@@ -4493,7 +4495,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4494,7 +4496,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public void setXRot(float pitch) {
if (!Float.isFinite(pitch)) {