1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-27 08:50:35 +01:00

Remove stacktrace on exception from reading server.properties ()

This commit is contained in:
Jake Potrebic 2023-06-16 19:27:45 -07:00 committed by GitHub
parent a226f44b45
commit 38856661c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
118 changed files with 41 additions and 30 deletions
patches/server
0859-Block-Ticking-API.patch0859-Remove-invalid-signature-login-stacktrace.patch0860-Add-Velocity-IP-Forwarding-Support.patch0861-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch0862-Add-NamespacedKey-biome-methods.patch0863-Fix-plugin-loggers-on-server-shutdown.patch0864-Stop-large-look-changes-from-crashing-the-server.patch0865-Fire-EntityChangeBlockEvent-in-more-places.patch0866-Missing-eating-regain-reason.patch0867-Missing-effect-cause.patch0868-Added-byte-array-serialization-deserialization-for-P.patch0869-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch0870-Call-BlockPhysicsEvent-more-often.patch0871-Configurable-chat-thread-limit.patch0872-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch0873-fix-Jigsaw-block-kicking-user.patch0874-use-BlockFormEvent-for-mud-converting-into-clay.patch0875-Add-getDrops-to-BlockState.patch0876-Fix-a-bunch-of-vanilla-bugs.patch0877-Remove-unnecessary-onTrackingStart-during-navigation.patch0878-Fix-custom-piglin-loved-items.patch0879-EntityPickupItemEvent-fixes.patch0880-Correctly-handle-interactions-with-items-on-cooldown.patch0881-Add-PlayerInventorySlotChangeEvent.patch0882-Elder-Guardian-appearance-API.patch0883-Allow-changing-bed-s-occupied-property.patch0884-Add-entity-knockback-API.patch0885-Detect-headless-JREs.patch0886-fixed-entity-vehicle-collision-event-not-called.patch0887-optimized-dirt-and-snow-spreading.patch0888-Added-EntityToggleSitEvent.patch0889-Add-fire-tick-delay-option.patch0890-Add-Moving-Piston-API.patch0891-Ignore-impossible-spawn-tick.patch0892-Track-projectile-source-for-fireworks-from-dispenser.patch0893-Fix-EntityArgument-suggestion-permissions-to-align-w.patch0894-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch0895-Prevent-compass-from-loading-chunks.patch0896-Add-PrePlayerAttackEntityEvent.patch0897-ensure-reset-EnderDragon-boss-event-name.patch0898-fix-MC-252817-green-map-markers-do-not-disappear.patch0899-Add-Player-Warden-Warning-API.patch0900-More-vanilla-friendly-methods-to-update-trades.patch0901-Add-paper-dumplisteners-command.patch0902-check-global-player-list-where-appropriate.patch0903-Fix-async-entity-add-due-to-fungus-trees.patch0904-ItemStack-damage-API.patch0905-Friction-API.patch0906-Ability-to-control-player-s-insomnia-and-phantoms.patch0907-Fix-player-kick-on-shutdown.patch0908-Sync-offhand-slot-in-menus.patch0909-Player-Entity-Tracking-Events.patch0910-Limit-pet-look-distance.patch0911-Properly-resend-entities.patch0912-Fixes-and-additions-to-the-SpawnReason-API.patch0913-fix-Instruments.patch0914-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch0915-Fix-inconsistencies-in-dispense-events-regarding-sta.patch0916-Add-BlockLockCheckEvent.patch0917-Add-Sneaking-API-for-Entities.patch0918-Improve-logging-and-errors.patch0919-Improve-PortalEvents.patch0920-Add-config-option-for-spider-worldborder-climbing.patch0921-Add-missing-SpigotConfig-logCommands-check.patch0922-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch0923-Flying-Fall-Damage.patch0924-Add-exploded-block-state-to-BlockExplodeEvent.patch0925-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch0926-config-for-disabling-entity-tag-tags.patch0927-Use-single-player-info-update-packet-on-join.patch0928-Correctly-shrink-items-during-EntityResurrectEvent.patch0929-Win-Screen-API.patch0930-Remove-CraftItemStack-setAmount-null-assignment.patch0931-Fix-force-opening-enchantment-tables.patch0932-Add-Entity-Body-Yaw-API.patch0933-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch0934-Update-the-flag-when-a-captured-block-state-is-outda.patch0935-Add-EntityFertilizeEggEvent.patch0936-Fix-HumanEntity-drop-not-updating-the-client-inv.patch0937-Add-CompostItemEvent-and-EntityCompostItemEvent.patch0938-Correctly-handle-ArmorStand-invisibility.patch0939-Fix-advancement-triggers-for-entity-damage.patch0940-Fix-text-display-error-on-spawn.patch0941-Fix-certain-inventories-returning-null-Locations.patch0942-Add-Shearable-API.patch0943-Fix-SpawnEggMeta-get-setSpawnedType.patch0944-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch0945-Optimize-Hoppers.patch0946-Fix-beehives-generating-from-using-bonemeal.patch0947-Fix-api-checking-banned-ips.patch0948-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch0949-Treat-sequence-violations-like-they-should-be.patch0950-remove-duplicate-animate-packet-for-records.patch0951-Prevent-causing-expired-keys-from-impacting-new-join.patch0952-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch0953-Use-array-for-gamerule-storage.patch0954-Fix-a-couple-of-upstream-bed-issues.patch0955-Fix-demo-flag-not-enabling-demo-mode.patch0956-Add-Mob-Experience-reward-API.patch0957-Break-redstone-on-top-of-trap-doors-early.patch

View file

@ -1,19 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Fri, 10 Jun 2022 16:02:35 +0200
Subject: [PATCH] Remove invalid signature login stacktrace
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 35ef7487060f81fb106a6a882006edf03023fd01..14488a4cdc3fc8edf3abb3d57ffdcc4880f987ee 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3588,7 +3588,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator, Duration.ZERO));
} catch (ProfilePublicKey.ValidationException profilepublickey_b) {
- ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage());
+ // ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage()); // Paper - unnecessary log
this.disconnect(profilepublickey_b.getComponent(), profilepublickey_b.kickCause); // Paper - kick event causes
}

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Elder Guardian appearance API
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 8369fa30d713e9917473d9d6caf4ebc4e3aad228..3975546e58ae69d5d9f662a446d0d68a731f45dc 100644
index b2f333b88f8282b01975c622c496ca796745b1d4..e0f2f83f411270ac3bc95979ab6778606b3fc890 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3083,6 +3083,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View file

@ -10,7 +10,7 @@ public net.minecraft.world.entity.monster.warden.WardenSpawnTracker cooldownTick
public net.minecraft.world.entity.monster.warden.WardenSpawnTracker increaseWarningLevel()V
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3975546e58ae69d5d9f662a446d0d68a731f45dc..627872976ae4c01f3e87b210ed745622e72c8552 100644
index e0f2f83f411270ac3bc95979ab6778606b3fc890..621a990a54e61e174e77558d70a84d6a215fb879 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3088,6 +3088,41 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View file

@ -66,7 +66,7 @@ index d088479d160dbd2fc90b48a30553be141db8eef2..bf6a70a69bb695ec1a202cd1e863c468
public static class DataItem<T> {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 14488a4cdc3fc8edf3abb3d57ffdcc4880f987ee..0d998395b65be269c2b5b58acd1b2b46408f8f8e 100644
index 35ef7487060f81fb106a6a882006edf03023fd01..1f6a0ec6e42906466aa63fe81f2d651b8512e837 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2799,7 +2799,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic

View file

@ -6,7 +6,7 @@ Subject: [PATCH] fix Instruments
properly handle Player#playNote
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 627872976ae4c01f3e87b210ed745622e72c8552..50036389960681b429836b28e608f512c104a888 100644
index 621a990a54e61e174e77558d70a84d6a215fb879..c1d8535564446d297238a962cc0956f75a314e7b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -717,29 +717,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View file

@ -4,6 +4,36 @@ Date: Wed, 14 Dec 2022 15:52:11 -0800
Subject: [PATCH] Improve logging and errors
diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
index f6e423a76d4c9cf639f1d44af80d33cf3072f6b5..135fc81414446f24c3adad71f5199c7898a6c1cd 100644
--- a/src/main/java/net/minecraft/server/dedicated/Settings.java
+++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
@@ -49,6 +49,12 @@ public abstract class Settings<T extends Settings<T>> {
}
public static Properties loadFromFile(Path path) {
+ // Paper start
+ if (Files.notExists(path)) {
+ LOGGER.info("Could not find existing {}. Creating with default values...", path.getFileName());
+ return new Properties();
+ }
+ // Paper end
try {
Properties properties;
Properties properties1;
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 1f6a0ec6e42906466aa63fe81f2d651b8512e837..0d998395b65be269c2b5b58acd1b2b46408f8f8e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3588,7 +3588,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.resetPlayerChatState(remotechatsession_a.validate(this.player.getGameProfile(), signaturevalidator, Duration.ZERO));
} catch (ProfilePublicKey.ValidationException profilepublickey_b) {
- ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage());
+ // ServerGamePacketListenerImpl.LOGGER.error("Failed to validate profile key: {}", profilepublickey_b.getMessage()); // Paper - unnecessary log
this.disconnect(profilepublickey_b.getComponent(), profilepublickey_b.kickCause); // Paper - kick event causes
}
diff --git a/src/main/java/net/minecraft/server/packs/PathPackResources.java b/src/main/java/net/minecraft/server/packs/PathPackResources.java
index 0232c29d96e1021a9f5a9678996993dc55fe7254..8ad8ad1189d7cdb58caaa39c482d32685afa3f9a 100644
--- a/src/main/java/net/minecraft/server/packs/PathPackResources.java

View file

@ -26,7 +26,7 @@ index 53487f0a4fe672298c3b83d24a2a603641afcde8..58152160d609d0e9d105153aeb166a56
} else {
if (fallDistance >= 2.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 50036389960681b429836b28e608f512c104a888..01d1878e1ce2338717e77ab729ed481fd5ff7252 100644
index c1d8535564446d297238a962cc0956f75a314e7b..3d447541b733aa6cefc29c49d551b83642bc1f2a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2304,6 +2304,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View file

@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API
public net.minecraft.server.level.ServerPlayer seenCredits
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 01d1878e1ce2338717e77ab729ed481fd5ff7252..19dfcb53fea04b13593adee4987eaa589546703d 100644
index 3d447541b733aa6cefc29c49d551b83642bc1f2a..3643c7f434d8aa66633311ccb77ba4d035e8d337 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1206,6 +1206,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

View file

@ -25,7 +25,7 @@ index c5f3dc74888919e82e2ffbb8d648b7640aa6b690..80cf4852e4010eeeadaf920ab927a40d
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index ac688d6175cc4c82cb454100b19738318503701a..deb1b4c4216f76c4b44a31c337d43baae8039640 100644
index 784623eefedfb601a8e0b8b42cbdb71eaebcac84..90ed64613717e104fc31d7e8d5df964c92119052 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -718,10 +718,16 @@ public final class ItemStack {

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Fix beehives generating from using bonemeal
diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
index deb1b4c4216f76c4b44a31c337d43baae8039640..da4e0712bea0c7aad9fe905b805b9fa11580f59f 100644
index 90ed64613717e104fc31d7e8d5df964c92119052..50141d426dc93149dc48d876487649aab7e74380 100644
--- a/src/main/java/net/minecraft/world/item/ItemStack.java
+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
@@ -392,6 +392,7 @@ public final class ItemStack {

Some files were not shown because too many files have changed in this diff Show more