Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-26 10:57:47 +01:00
Code Issues Projects Releases Wiki Activity

Update upstream S

Browse Source
This commit is contained in:
Zach Brown 2017-02-04 03:59:44 -06:00
parent 8878ecc5f3
commit d3544dad18
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0028-Lighting-Queue.patch
View File

@ -1,4 +1,4 @@
From e3ec2eda60b7343add29c6546bc8e818239e6a18 Mon Sep 17 00:00:00 2001 From befa5d1bd6dfb9a08d165e275cd9bd51200940d2 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net> From: Byteflux <byte@byteflux.net>
Date: Wed, 2 Mar 2016 00:52:31 -0600 Date: Wed, 2 Mar 2016 00:52:31 -0600
Subject: [PATCH] Lighting Queue Subject: [PATCH] Lighting Queue
@ -85,10 +85,10 @@ index 1c0108ef1..b80f95159 100644
TileEntity tileentity; TileEntity tileentity;
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index e18fb875f..8c015c095 100644 index 3ba489d4f..f7f2d12cf 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -292,6 +292,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -295,6 +295,7 @@ public class ChunkProviderServer implements IChunkProvider {
return false; return false;
} }
save = event.isSaveChunk(); save = event.isSaveChunk();
@ -238,5 +238,5 @@ index 4a35d06e4..b38228707 100644
} }
-- --
2.11.0.windows.3 2.11.0

8
Spigot-Server-Patches/0133-Fix-Chunk-Unload-Queue-Issues.patch
View File

@ -1,4 +1,4 @@
From 9a2443eb072a8c68194404566dc006841f2ceb32 Mon Sep 17 00:00:00 2001 From 30c09c852ad1aae23ece5182a9e4d06f89e79a53 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 12 May 2016 02:03:56 -0400 Date: Thu, 12 May 2016 02:03:56 -0400
Subject: [PATCH] Fix Chunk Unload Queue Issues Subject: [PATCH] Fix Chunk Unload Queue Issues
@ -22,10 +22,10 @@ index 3db29161d..98f2cff15 100644
// Paper start // Paper start
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index a6f044461..279ef5de5 100644 index 54b454fe3..57ae50d2e 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -296,6 +296,7 @@ public class ChunkProviderServer implements IChunkProvider { @@ -299,6 +299,7 @@ public class ChunkProviderServer implements IChunkProvider {
if (chunk != null && chunk.d) { if (chunk != null && chunk.d) {
// CraftBukkit start - move unload logic to own method // CraftBukkit start - move unload logic to own method
@ -34,5 +34,5 @@ index a6f044461..279ef5de5 100644
continue; continue;
} }
-- --
2.11.0.windows.3 2.11.0

8
Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch
View File

@ -1,4 +1,4 @@
From 8d76310982f39f70536a847c399e66923667d6f5 Mon Sep 17 00:00:00 2001 From ed8e49d8515b58275cf99651811ea92a1704afc1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 18 Jun 2016 23:22:12 -0400 Date: Sat, 18 Jun 2016 23:22:12 -0400
Subject: [PATCH] Delay Chunk Unloads based on Player Movement Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@ -47,10 +47,10 @@ index 98f2cff15..88437d77a 100644
public final int locZ; public final int locZ;
private boolean m; private boolean m;
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 279ef5de5..25deecc4d 100644 index 57ae50d2e..0a8e09e5e 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -312,6 +312,19 @@ public class ChunkProviderServer implements IChunkProvider { @@ -315,6 +315,19 @@ public class ChunkProviderServer implements IChunkProvider {
activityAccountant.endActivity(); // Spigot activityAccountant.endActivity(); // Spigot
} }
@ -140,5 +140,5 @@ index 73aee9b0d..5a44a9f38 100644
} }
-- --
2.11.0.windows.3 2.11.0

2
work/Spigot

@ -1 +1 @@
Subproject commit 47414001a0202ebd8bd80feb532b0ef9ce1733a9 Subproject commit b4417b8d188ae9d59bc9fc02bbc5b08690e40f64