mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update upstream B/CB

Browse source
This commit is contained in:
Zach Brown 2016-06-19 21:41:46 -05:00
parent 8c19e5c900
commit a656161705
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
8 changed files with 11 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Spigot-Server-Patches/0077-Chunk-save-queue-improvements.patch
View file

@ -1,4 +1,4 @@
From 4701662038fd8f8d30764ff934ae094f0b916f15 Mon Sep 17 00:00:00 2001
From 5186a9f25fcac14abe91f6b49adcf8ee41ad3c2a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 4 Mar 2016 18:18:37 -0600
Subject: [PATCH] Chunk save queue improvements
@ -41,7 +41,7 @@ index 9ab6445..d01bca1 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 4fe7713..d4386e3 100644
index 04a4b5d..c89d533 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -12,14 +12,17 @@ import java.util.Map;
@ -128,7 +128,7 @@ index 4fe7713..d4386e3 100644
}
return flag;
@@ -550,4 +558,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -551,4 +559,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
return entity;
}
}
@ -170,5 +170,5 @@ index acfdd52..fdbaf5f 100644
if (this.b.isEmpty()) {
--
2.8.3
2.9.0

23
Spigot-Server-Patches/0163-Fix-infinite-loop-when-saving-chunks.patch
View file

@ -1,23 +0,0 @@
From d2f4f7f5f8868078bedfad4f64e84e54782fd694 Mon Sep 17 00:00:00 2001
From: Jadon Fowler <jadonflower@gmail.com>
Date: Fri, 17 Jun 2016 02:26:58 -0700
Subject: [PATCH] Fix infinite loop when saving chunks
Running `/save-all flush` would start an infinite loop that prints:
ThreadedAnvilChunkStorage (world): All chunks are saved
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index facc97b..2081c29 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -219,6 +219,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
if (this.c()) {
continue;
}
+ break; // Paper - fix infinite loop when saving chunks
}
} finally {
this.f = false;
--
2.7.4

2
Spigot-Server-Patches/0164-Make-entities-look-for-hoppers.patch → Spigot-Server-Patches/0163-Make-entities-look-for-hoppers.patch
View file

@ -1,4 +1,4 @@
From 4c0a4516fb82d1b4436faa124c595d28c46d3f02 Mon Sep 17 00:00:00 2001
From bef9ceb5cdf08de5f3a490006c815683787be319 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sat, 18 Jun 2016 01:01:37 -0500
Subject: [PATCH] Make entities look for hoppers

2
Spigot-Server-Patches/0165-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch → Spigot-Server-Patches/0164-Remove-the-item-from-the-correct-hand-when-spawn-egg.patch
View file

@ -1,4 +1,4 @@
From 51086b7a0e474b8832ac8dd7e4ec5e2a21be1cfb Mon Sep 17 00:00:00 2001
From fa78c3efb0e8cc916099b2d5ff82fb0f0ff15bd2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 18 Jun 2016 01:49:22 -0400
Subject: [PATCH] Remove the item from the correct hand when spawn egg depletes

2
Spigot-Server-Patches/0166-Delay-Chunk-Unloads-based-on-Player-Movement.patch → Spigot-Server-Patches/0165-Delay-Chunk-Unloads-based-on-Player-Movement.patch
View file

@ -1,4 +1,4 @@
From 68e4453fda0928d5f744d39a343cd16afc82bed2 Mon Sep 17 00:00:00 2001
From 6c6da4b09e041c1e28351e9cd24bfa28b8d9f670 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 18 Jun 2016 23:22:12 -0400
Subject: [PATCH] Delay Chunk Unloads based on Player Movement

4
Spigot-Server-Patches/0167-Toggleable-Elytra-Wall-Damage.patch → Spigot-Server-Patches/0166-Toggleable-Elytra-Wall-Damage.patch
View file

@ -1,4 +1,4 @@
From e03e8a975e0e96c5de2e5e63aff85251e1561850 Mon Sep 17 00:00:00 2001
From 64c431c0f8520e108302357258a9a962e0cd8d68 Mon Sep 17 00:00:00 2001
From: Jadon Fowler <jadonflower@gmail.com>
Date: Sat, 18 Jun 2016 23:13:59 -0700
Subject: [PATCH] Toggleable Elytra Wall Damage
@ -41,5 +41,5 @@ index 4e424aa..af0127e 100644
if (this.onGround && !this.world.isClientSide) {
if (getFlag(7) && !CraftEventFactory.callToggleGlideEvent(this, false).isCancelled()) // CraftBukkit
--
2.7.4
2.9.0

2
work/Bukkit

@ -1 +1 @@
Subproject commit eb9f4ee387c12e0179e32cd581575d79d2b93ec5
Subproject commit da1195392ac6db7015a83165a01b9c62b8380a24

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 9856d8a18395617ffa0ecc05dcbf9255e6a66d12
Subproject commit 9af379fc4741a6fb487aaf4b5c7ffdbcbb12ca4f