core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Upstream

This commit is contained in:
Aikar 2016-05-25 12:37:17 -04:00
parent 391d0c04f8
commit 13492455a1
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/0086-Add-World-Util-Methods.patch
View File

@ -1,4 +1,4 @@
From 2e5d3ab319b7c04911614a21e08c28144e9544f8 Mon Sep 17 00:00:00 2001
From 12e2338b328449eb9044d34d5cd5f5ecf2e1f575 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 18 Mar 2016 20:16:03 -0400
Subject: [PATCH] Add World Util Methods
@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
Methods that can be used for other patches to help improve logic.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ccbfda0..133d4e2 100644
index e092ba5..276cdf4 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -153,6 +153,12 @@ public abstract class World implements IBlockAccess {
@ -20,7 +20,7 @@ index ccbfda0..133d4e2 100644
+ // Paper end
+
public Chunk getChunkIfLoaded(int x, int z) {
return ((ChunkProviderServer) this.chunkProvider).getLoadedChunkAt(x, z);
return ((ChunkProviderServer) this.chunkProvider).getChunkIfLoaded(x, z);
}
@@ -630,6 +636,41 @@ public abstract class World implements IBlockAccess {
}
@ -93,5 +93,5 @@ index ccbfda0..133d4e2 100644
// CraftBukkit start - tree generation
if (captureTreeGeneration) {
--
2.8.2
2.8.3

8
Spigot-Server-Patches/0129-Fix-some-players-not-being-kicked-on-shutdown.patch
View File

@ -1,14 +1,14 @@
From 01394f77038783cd529dd8069cbf0084e9f4a9b7 Mon Sep 17 00:00:00 2001
From b1d4330c0fd8473081cae9431e874043ff3433f8 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Tue, 29 Mar 2016 20:19:20 -0400
Subject: [PATCH] Fix some players not being kicked on shutdown
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index ac3bdd1..9d25312 100644
index 8075417..987e393 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1294,9 +1294,11 @@ public abstract class PlayerList {
@@ -1295,9 +1295,11 @@ public abstract class PlayerList {
}
public void u() {
@ -23,5 +23,5 @@ index ac3bdd1..9d25312 100644
}
--
2.8.2
2.8.3

8
Spigot-Server-Patches/0152-Do-not-mark-chunks-as-active-for-neighbor-updates.patch
View File

@ -1,4 +1,4 @@
From bf3daa6e44b5a5c1d7949b82a985c3ae89d90df1 Mon Sep 17 00:00:00 2001
From a7b3f62597464c1911ef9e2a8ad16d50dcce9e55 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 12 May 2016 01:55:17 -0400
Subject: [PATCH] Do not mark chunks as active for neighbor updates
@ -66,14 +66,14 @@ index f8905b4..6d1b98b 100644
neighbor.setNeighborUnloaded(-x, -z);
chunk.setNeighborUnloaded(x, z);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 1adfc03..b1a7435 100644
index 6a3e939..b1a7435 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -241,7 +241,7 @@ public class CraftWorld implements World {
continue;
}
- net.minecraft.server.Chunk neighbor = world.getChunkProviderServer().getLoadedChunkAt(chunk.locX + x, chunk.locZ + z);
- net.minecraft.server.Chunk neighbor = world.getChunkProviderServer().getChunkIfLoaded(chunk.locX + x, chunk.locZ + z);
+ net.minecraft.server.Chunk neighbor = net.minecraft.server.MCUtil.getLoadedChunkWithoutMarkingActive(world, chunk.locX + x, chunk.locZ + z); // Paper
if (neighbor != null) {
neighbor.setNeighborUnloaded(-xx, -zz);
@ -109,5 +109,5 @@ index 7b61b14..7752b50 100644
neighbor.setNeighborLoaded(-x, -z);
chunk.setNeighborLoaded(x, z);
--
2.8.2.windows.1
2.8.3

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 8982e3f33e4c1d47fe31d71c8dc25e929d7b99d7
Subproject commit 042911fef46a2efd1fcc4266a01ede48e6e2948c