Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-02 17:01:38 +01:00
Code Issues Projects Releases Wiki Activity
34e64781e8
Paper/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch

23 lines
1.1 KiB
Diff
Raw Normal View History

Update upstream & fix some chunk related issues (#2177) * Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33
2019-06-14 04:27:40 +02:00
From c152aca8fcec30e72124c9311bbeae06f6aa1c34 Mon Sep 17 00:00:00 2001
Check online mode before converting and renaming player data
2015-03-05 22:30:48 +01:00
From: Zach Brown <zach.brown@destroystokyo.com>
Paper 1.9
2016-03-01 00:09:49 +01:00
Date: Wed, 2 Mar 2016 00:03:55 -0600
Check online mode before converting and renaming player data
2015-03-05 22:30:48 +01:00
Subject: [PATCH] Check online mode before converting and renaming player data
diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
2019-06-06 17:36:57 +02:00
index 97bac7d257..a0254d8e51 100644
Check online mode before converting and renaming player data
2015-03-05 22:30:48 +01:00
--- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
A bit more work for 1.14
2019-04-24 04:34:11 +02:00
@@ -164,7 +164,7 @@ public class WorldNBTStorage implements IPlayerFileData {
File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat");
Check online mode before converting and renaming player data
2015-03-05 22:30:48 +01:00
// Spigot Start
boolean usingWrongFile = false;
- if ( !file.exists() )
Paper 1.9
2016-03-01 00:09:49 +01:00
+ if ( org.bukkit.Bukkit.getOnlineMode() && !file.exists() ) // Paper - Check online mode first
Check online mode before converting and renaming player data
2015-03-05 22:30:48 +01:00
{
file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat");
if ( file.exists() )
--
Initial work on 1.14 pre-5
2019-04-23 06:47:07 +02:00
2.21.0
Check online mode before converting and renaming player data
2015-03-05 22:30:48 +01:00
Reference in New Issue Copy Permalink