diff options
| author | Zach Brown <[email protected]> | 2017-04-28 19:25:52 -0500 |
|---|---|---|
| committer | Zach Brown <[email protected]> | 2017-04-28 19:25:52 -0500 |
| commit | 8b2122a291e3ea68f0e1516209914ef43a2d55e9 (patch) | |
| tree | 8a94a6bbe952998f4fac4ed2474268ae4fd48563 /Spigot-Server-Patches/0158-Auto-Save-Improvements.patch | |
| parent | 157528a29e158d3437ee1569820875ef751d1dec (diff) | |
| download | Paper-8b2122a291e3ea68f0e1516209914ef43a2d55e9.tar.gz Paper-8b2122a291e3ea68f0e1516209914ef43a2d55e9.zip | |
Update upstream B/CB/S
Diffstat (limited to 'Spigot-Server-Patches/0158-Auto-Save-Improvements.patch')
| -rw-r--r-- | Spigot-Server-Patches/0158-Auto-Save-Improvements.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch index fe441428a2..2e2fe6051c 100644 --- a/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch +++ b/Spigot-Server-Patches/0158-Auto-Save-Improvements.patch @@ -1,4 +1,4 @@ -From acd7a746b5bf9c66021066b91467f8f808772d3d Mon Sep 17 00:00:00 2001 +From 4978f444ee1bb732f34447349281f25b8f470a13 Mon Sep 17 00:00:00 2001 From: Aikar <[email protected]> Date: Mon, 19 Sep 2016 23:16:39 -0400 Subject: [PATCH] Auto Save Improvements @@ -76,7 +76,7 @@ index 88437d77a..9f7f32dc2 100644 public Random a(long i) { diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 0a8e09e5e..ad668be62 100644 +index 81b9bb884..71df9e4aa 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -1,5 +1,6 @@ @@ -96,7 +96,7 @@ index 0a8e09e5e..ad668be62 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index acda1843d..171ed25c3 100644 +index 4e8efc549..55c966811 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -32,6 +32,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -155,7 +155,7 @@ index 2349c3ade..8134501c7 100644 this.methodProfiler.a("tallying"); // Spigot start diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 50a3dfe44..185b5929f 100644 +index 97322c5da..58f30fb1d 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -330,6 +330,7 @@ public abstract class PlayerList { @@ -166,7 +166,7 @@ index 50a3dfe44..185b5929f 100644 this.playerFileData.save(entityplayer); ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) this.o.get(entityplayer.getUniqueID()); -@@ -1206,13 +1207,23 @@ public abstract class PlayerList { +@@ -1207,13 +1208,23 @@ public abstract class PlayerList { } @@ -215,5 +215,5 @@ index f969d2a72..cc0e8d2c8 100644 timings.worldSaveChunks.startTiming(); // Paper chunkproviderserver.a(flag); -- -2.12.2 +2.12.2.windows.2 |