Remove "Auto fix bad Y levels on player login" patch
Fixes #6357 Closes #6508 Closes #6358
This commit is contained in:
parent
5c7da5536b
commit
cc6fd371b2
696 changed files with 106 additions and 125 deletions
patches/server
0108-Auto-fix-bad-Y-levels-on-player-login.patch0108-Option-to-remove-corrupt-tile-entities.patch0109-Add-EntityZapEvent.patch0110-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch0111-Cache-user-authenticator-threads.patch0112-Allow-Reloading-of-Command-Aliases.patch0113-Add-source-to-PlayerExpChangeEvent.patch0114-Don-t-let-fishinghooks-use-portals.patch0115-Add-ProjectileCollideEvent.patch0116-Prevent-Pathfinding-out-of-World-Border.patch0117-Optimize-World.isLoaded-BlockPosition-Z.patch0118-Bound-Treasure-Maps-to-World-Border.patch0119-Configurable-Cartographer-Treasure-Maps.patch0120-Optimize-ItemStack.isEmpty.patch0121-Add-API-methods-to-control-if-armour-stands-can-move.patch0122-String-based-Action-Bar-API.patch0123-Properly-fix-item-duplication-bug.patch0124-Firework-API-s.patch0125-PlayerTeleportEndGatewayEvent.patch0126-Provide-E-TE-Chunk-count-stat-methods.patch0127-Enforce-Sync-Player-Saves.patch0128-Don-t-allow-entities-to-ride-themselves-572.patch0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch0130-Cap-Entity-Collisions.patch0131-Remove-CraftScheduler-Async-Task-Debugger.patch0132-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch0133-Do-not-let-armorstands-drown.patch0134-Properly-handle-async-calls-to-restart-the-server.patch0135-Add-option-to-make-parrots-stay-on-shoulders-despite.patch0136-Add-configuration-option-to-prevent-player-names-fro.patch0137-Use-TerminalConsoleAppender-for-console-improvements.patch0138-provide-a-configurable-option-to-disable-creeper-lin.patch0139-Item-canEntityPickup.patch0140-PlayerPickupItemEvent-setFlyAtPlayer.patch0141-PlayerAttemptPickupItemEvent.patch0142-Add-UnknownCommandEvent.patch0143-Basic-PlayerProfile-API.patch0144-Shoulder-Entities-Release-API.patch0145-Profile-Lookup-Events.patch0146-Block-player-logins-during-server-shutdown.patch0147-Entity-fromMobSpawner.patch0148-Improve-the-Saddle-API-for-Horses.patch0149-Implement-ensureServerConversions-API.patch0150-Implement-getI18NDisplayName.patch0151-ProfileWhitelistVerifyEvent.patch0152-Fix-this-stupid-bullshit.patch0153-LivingEntity-setKiller.patch0154-Ocelot-despawns-should-honor-nametags-and-leash.patch0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch0156-Allow-specifying-a-custom-authentication-servers-dow.patch0157-Handle-plugin-prefixes-using-Log4J-configuration.patch0158-Improve-Log4J-Configuration-Plugin-Loggers.patch0159-Add-PlayerJumpEvent.patch0160-handle-PacketPlayInKeepAlive-async.patch0161-Expose-client-protocol-version-and-virtual-host.patch0162-revert-serverside-behavior-of-keepalives.patch0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch0164-Add-PlayerArmorChangeEvent.patch0165-Prevent-logins-from-being-processed-when-the-player-.patch0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch0167-use-CB-BlockState-implementations-for-captured-block.patch0168-API-to-get-a-BlockState-without-a-snapshot.patch0169-AsyncTabCompleteEvent.patch0170-PlayerPickupExperienceEvent.patch0171-Ability-to-apply-mending-to-XP-API.patch0172-Make-max-squid-spawn-height-configurable.patch0173-PlayerNaturallySpawnCreaturesEvent.patch0174-PreCreatureSpawnEvent.patch0175-Add-setPlayerProfile-API-for-Skulls.patch0176-Fill-Profile-Property-Events.patch0177-PlayerAdvancementCriterionGrantEvent.patch0178-Add-ArmorStand-Item-Meta.patch0179-Extend-Player-Interact-cancellation.patch0180-Tameable-getOwnerUniqueId-API.patch0181-Toggleable-player-crits-helps-mitigate-hacked-client.patch0182-Disable-Explicit-Network-Manager-Flushing.patch0183-Implement-extended-PaperServerListPingEvent.patch0184-Improved-Async-Task-Scheduler.patch0185-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch0186-Player.setPlayerProfile-API.patch0187-getPlayerUniqueId-API.patch0188-Upstream-config-migrations.patch0189-Make-legacy-ping-handler-more-reliable.patch0190-Call-PaperServerListPingEvent-for-legacy-pings.patch0191-Flag-to-disable-the-channel-limit.patch0192-Add-method-to-open-already-placed-sign.patch0193-Configurable-sprint-interruption-on-attack.patch0194-Fix-exploit-that-allowed-colored-signs-to-be-created.patch0195-EndermanEscapeEvent.patch0196-Enderman.teleportRandomly.patch0197-Block-Enderpearl-Travel-Exploit.patch0198-Expand-World.spawnParticle-API-and-add-Builder.patch0199-Prevent-Frosted-Ice-from-loading-holding-chunks.patch0200-EndermanAttackPlayerEvent.patch0201-WitchConsumePotionEvent.patch0202-WitchThrowPotionEvent.patch0203-Allow-spawning-Item-entities-with-World.spawnEntity.patch0204-WitchReadyPotionEvent.patch0205-ItemStack-getMaxItemUseDuration.patch0206-Implement-EntityTeleportEndGatewayEvent.patch
|
@ -1,19 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 21 Sep 2016 23:48:39 -0400
|
||||
Subject: [PATCH] Auto fix bad Y levels on player login
|
||||
|
||||
Bring down to a saner Y level if super high, as this can cause the server to crash
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index 7e7bbb6817ceddbbb90c1ac45d8e974d3f95c089..fe19a883cbf646442da19ca7380e3ecf05fadc2f 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -397,6 +397,7 @@ public class ServerPlayer extends Player {
|
||||
@Override
|
||||
public void readAdditionalSaveData(CompoundTag nbt) {
|
||||
super.readAdditionalSaveData(nbt);
|
||||
+ if (this.getY() > 300) this.setPosRaw(getX(), 257, getZ()); // Paper - bring down to a saner Y level if out of world
|
||||
if (nbt.contains("enteredNetherPosition", 10)) {
|
||||
CompoundTag nbttagcompound1 = nbt.getCompound("enteredNetherPosition");
|
||||
|
|
@ -5,7 +5,7 @@ Subject: [PATCH] Add source to PlayerExpChangeEvent
|
|||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
||||
index 8b8181cfdd8d826dd132eb9475f6ff8e04afa465..4000480a14d2ba52149f4fa47f824abfa2e0e5f8 100644
|
||||
index b902bca6135c3a7be4804a441bbf8f73b4596432..41556294841b2c280ba4eff861405ccb6aee19e5 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
||||
@@ -246,7 +246,7 @@ public class ExperienceOrb extends Entity {
|
|
@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
|
|||
Credit to prplz for figuring out the real issue
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index fe19a883cbf646442da19ca7380e3ecf05fadc2f..e5bafb77d26a95fab4b0f7a419fc09f885821c0d 100644
|
||||
index 7e7bbb6817ceddbbb90c1ac45d8e974d3f95c089..d4614faa22485dce226f3dc17ef984212ac8fcb9 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -2129,7 +2129,7 @@ public class ServerPlayer extends Player {
|
||||
@@ -2128,7 +2128,7 @@ public class ServerPlayer extends Player {
|
||||
|
||||
@Override
|
||||
public boolean isImmobile() {
|
|
@ -21,7 +21,7 @@ index f772924217c0531b09662a145d8ee5d22dd5ca51..ecfb88b4d9727ad20a2c33475cc6b1ec
|
|||
|
||||
return true;
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
||||
index 4000480a14d2ba52149f4fa47f824abfa2e0e5f8..ea01f84448693ca740b5f3381a9c500e5aa3914e 100644
|
||||
index 41556294841b2c280ba4eff861405ccb6aee19e5..5220e3ee9fab4c4cbc95e0cf1928392316a35e34 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
||||
@@ -38,13 +38,63 @@ public class ExperienceOrb extends Entity {
|
|
@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
|
|||
Allows plugins to cancel a player picking up an experience orb
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
||||
index ea01f84448693ca740b5f3381a9c500e5aa3914e..707380c41df3a5783953ee0b6fe81b55fc7ed3cd 100644
|
||||
index 5220e3ee9fab4c4cbc95e0cf1928392316a35e34..1fdfeaa7758497e93fc13b44996e11d74a812546 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
||||
@@ -300,7 +300,7 @@ public class ExperienceOrb extends Entity {
|
|
@ -56,7 +56,7 @@ index 3e2a5f83afcc3b9c9fe62748895d489135af03bf..dd61048b3898ef3ea5a2bd2f95e9bd3f
|
|||
list.forEach((playerchunk) -> {
|
||||
Optional<LevelChunk> optional = ((Either) playerchunk.getTickingChunkFuture().getNow(ChunkHolder.UNLOADED_LEVEL_CHUNK)).left();
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index e5bafb77d26a95fab4b0f7a419fc09f885821c0d..3a3f04cc3aaaebc1df8eace740ca29203bd6d871 100644
|
||||
index d4614faa22485dce226f3dc17ef984212ac8fcb9..66434418fae67ff63450bc246796c7f3d4d09ae6 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -1,5 +1,6 @@
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue