OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 07:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update upstream and remove hopper patch for #1270

Browse source
This commit is contained in:
Aikar 2018-07-25 01:11:08 -04:00
parent af561492ab
commit c280d84172
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
9 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/0306-Don-t-save-Proto-Chunks.patch → Spigot-Server-Patches/0305-Don-t-save-Proto-Chunks.patch
View file

@ -1,4 +1,4 @@
From 114ef33e651ac74cef786afa84ff16003b0cccfb Mon Sep 17 00:00:00 2001 From 29f7275b4762c83996dee6cd72fa71af7adc0f81 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 22 Jul 2018 21:21:41 -0400 Date: Sun, 22 Jul 2018 21:21:41 -0400
Subject: [PATCH] Don't save Proto Chunks Subject: [PATCH] Don't save Proto Chunks
@ -8,7 +8,7 @@ the loadChunk method refuses to acknoledge they exists, and will restart
a new chunk generation process to begin with, so saving them serves no benefit. a new chunk generation process to begin with, so saving them serves no benefit.
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index ea8684747..a97e024ec 100644 index 5fd0c0cf50..43348a627f 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -282,6 +282,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver { @@ -282,6 +282,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -20,7 +20,7 @@ index ea8684747..a97e024ec 100644
world.checkSession(); world.checkSession();
diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
index 501565dd5..7b3068753 100644 index 501565dd5d..7b30687530 100644
--- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
@@ -23,7 +23,7 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus @@ -23,7 +23,7 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus

6
Spigot-Server-Patches/0307-Optimize-RegistryID.c.patch → Spigot-Server-Patches/0306-Optimize-RegistryID.c.patch
View file

@ -1,4 +1,4 @@
From 48a1b1c1f5b4572ab2ade1314c35c9508d3644ea Mon Sep 17 00:00:00 2001 From 6e996abb708a54a6171ee963ec1569ceb5c0d2cf Mon Sep 17 00:00:00 2001
From: Andrew Steinborn <git@steinborn.me> From: Andrew Steinborn <git@steinborn.me>
Date: Mon, 23 Jul 2018 13:08:19 -0400 Date: Mon, 23 Jul 2018 13:08:19 -0400
Subject: [PATCH] Optimize RegistryID.c() Subject: [PATCH] Optimize RegistryID.c()
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c()
This is a frequent hotspot for world loading/saving. This is a frequent hotspot for world loading/saving.
diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
index bde5714d..a01cda9d 100644 index bde5714dd6..a01cda9d81 100644
--- a/src/main/java/net/minecraft/server/RegistryID.java --- a/src/main/java/net/minecraft/server/RegistryID.java
+++ b/src/main/java/net/minecraft/server/RegistryID.java +++ b/src/main/java/net/minecraft/server/RegistryID.java
@@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix @@ -14,12 +14,14 @@ public class RegistryID<K> implements Registry { // Paper - decompile fix
@ -64,5 +64,5 @@ index bde5714d..a01cda9d 100644
public int b() { public int b() {
-- --
2.17.0 (Apple Git-106) 2.18.0

6
Spigot-Server-Patches/0308-Option-to-prevent-armor-stands-from-doing-entity-loo.patch → Spigot-Server-Patches/0307-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
View file

@ -1,11 +1,11 @@
From 6e268e2762db21feffbcde6e6d4b2e5e2d8e8668 Mon Sep 17 00:00:00 2001 From 51044d9a361f21f02b6c9fadb0a9d9d5e37d636c Mon Sep 17 00:00:00 2001
From: Hugo Manrique <hugmanrique@gmail.com> From: Hugo Manrique <hugmanrique@gmail.com>
Date: Mon, 23 Jul 2018 12:57:39 +0200 Date: Mon, 23 Jul 2018 12:57:39 +0200
Subject: [PATCH] Option to prevent armor stands from doing entity lookups Subject: [PATCH] Option to prevent armor stands from doing entity lookups
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index a8470e6e7..f33cd90d2 100644 index b9f5f49055..aa95372e69 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -350,6 +350,11 @@ public class PaperWorldConfig { @@ -350,6 +350,11 @@ public class PaperWorldConfig {
@ -21,7 +21,7 @@ index a8470e6e7..f33cd90d2 100644
private void maxEntityCollision() { private void maxEntityCollision() {
maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) ); maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 127dcedc9..72e22c09b 100644 index 127dcedc97..72e22c09ba 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -11,6 +11,7 @@ import java.util.Iterator; @@ -11,6 +11,7 @@ import java.util.Iterator;

4
Spigot-Server-Patches/0309-Thread-Safe-Iteration-of-Chunk-Scheduler.patch → Spigot-Server-Patches/0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch
View file

@ -1,11 +1,11 @@
From b8644d59101dbe08f8213be53d43d51a2e41a300 Mon Sep 17 00:00:00 2001 From fc2eced1f0c62db6c0eea3efac000fd94ad623a6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 23 Jul 2018 19:13:06 -0400 Date: Mon, 23 Jul 2018 19:13:06 -0400
Subject: [PATCH] Thread Safe Iteration of Chunk Scheduler Subject: [PATCH] Thread Safe Iteration of Chunk Scheduler
diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
index 7b3068753..45f9ad372 100644 index 7b30687530..45f9ad3726 100644
--- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@

4
Spigot-Server-Patches/0310-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch → Spigot-Server-Patches/0309-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch
View file

@ -1,4 +1,4 @@
From 37d9641af77fd0ec11e932162a0125bd53f05ce3 Mon Sep 17 00:00:00 2001 From f159b677ff7fabd0341ec5ae5b74bddda4d86b52 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 23 Jul 2018 22:18:31 -0400 Date: Mon, 23 Jul 2018 22:18:31 -0400
Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 95c6812d7..aa75cc420 100644 index 95c6812d7d..aa75cc4205 100644
--- a/src/main/java/net/minecraft/server/Chunk.java --- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -714,6 +714,7 @@ public class Chunk implements IChunkAccess { @@ -714,6 +714,7 @@ public class Chunk implements IChunkAccess {

6
Spigot-Server-Patches/0311-Add-some-Debug-to-Chunk-Entity-slices.patch → Spigot-Server-Patches/0310-Add-some-Debug-to-Chunk-Entity-slices.patch
View file

@ -1,4 +1,4 @@
From 1a1fa5156619969d65be7638a7cd2f056c9a933c Mon Sep 17 00:00:00 2001 From 8b56a881c447a5f3f72582d443339843298a1f16 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 23 Jul 2018 22:44:23 -0400 Date: Mon, 23 Jul 2018 22:44:23 -0400
Subject: [PATCH] Add some Debug to Chunk Entity slices Subject: [PATCH] Add some Debug to Chunk Entity slices
@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
if the entity was to end up in 2 different chunk slices if the entity was to end up in 2 different chunk slices
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index aa75cc420..56a74c606 100644 index aa75cc4205..56a74c6062 100644
--- a/src/main/java/net/minecraft/server/Chunk.java --- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -712,8 +712,33 @@ public class Chunk implements IChunkAccess { @@ -712,8 +712,33 @@ public class Chunk implements IChunkAccess {
@ -61,7 +61,7 @@ index aa75cc420..56a74c606 100644
if (entity instanceof EntityItem) { if (entity instanceof EntityItem) {
itemCounts[i]--; itemCounts[i]--;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b6d6d4f37..bc4ba9f3c 100644 index 9f2a23d693..7a63114fe5 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -63,6 +63,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -63,6 +63,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

4
Spigot-Server-Patches/0312-Optimize-Region-File-Cache.patch → Spigot-Server-Patches/0311-Optimize-Region-File-Cache.patch
View file

@ -1,4 +1,4 @@
From e979cf5f12f51ca8cea8931026b091f21cc62eb9 Mon Sep 17 00:00:00 2001 From cf496744a11659b8a12697b56a3d057b24203df9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 23 Jul 2018 23:40:04 -0400 Date: Mon, 23 Jul 2018 23:40:04 -0400
Subject: [PATCH] Optimize Region File Cache Subject: [PATCH] Optimize Region File Cache
@ -32,7 +32,7 @@ synchronized context, reducing lock times.
Ultimately: This brings us back to Vanilla, which has had no indication of region file loss. Ultimately: This brings us back to Vanilla, which has had no indication of region file loss.
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index 3b8d01ea1..609d6c355 100644 index 3b8d01ea1a..609d6c3550 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java --- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -97,7 +97,7 @@ public class RegionFileCache { @@ -97,7 +97,7 @@ public class RegionFileCache {

0
Spigot-Server-Patches/0305-Optimize-Hoppers.patch → removed/server/0305-Optimize-Hoppers.patch
View file

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 49a2604e1f8721c813820c847f971df4c25002e1 Subproject commit 9646d8d7800931effa31be173fda765ecdf996c4