Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 02:55:47 +01:00
Code Issues Projects Releases Wiki Activity

rebuild patch and delete unused

Browse Source
This commit is contained in:
Aikar 2018-07-23 20:16:48 -04:00
parent 1b3658b2c4
commit 56d4a0e1fe
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
3 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Spigot-Server-Patches/0307-Thread-Safe-Iteration-of-Chunk-Scheduler.patch → Spigot-Server-Patches/0308-Thread-Safe-Iteration-of-Chunk-Scheduler.patch
View File

@ -1,4 +1,4 @@
From bdd76dbf6c7b71856f5edb1ea7cf572b76706cad Mon Sep 17 00:00:00 2001 From c4f6d7b6868a203037dacc6d4dbcf8c065babf6e 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

21
removed/server/0197-Assign-the-World-in-WorldGenStronghold.patch
View File

@ -1,21 +0,0 @@
From 9d2c2c0c6e0763a163a8a52d4e8323e853c19cb1 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 14 Jan 2017 01:22:07 -0600
Subject: [PATCH] Assign the World in WorldGenStronghold
diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
index c93754704..a3b958e01 100644
--- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
+++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
@@ -56,6 +56,7 @@ public class WorldGenStronghold extends StructureGenerator {
}
public BlockPosition getNearestGeneratedFeature(World world, BlockPosition blockposition, boolean flag) {
+ this.g = world; // Paper
if (!this.b) {
this.c();
this.b = true;
--
2.18.0

25
removed/server/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
View File

@ -1,25 +0,0 @@
From ddb5420fbc247f84c5d4877b77716179535385ba Mon Sep 17 00:00:00 2001
From: Brokkonaut <hannos17@gmx.de>
Date: Fri, 11 Aug 2017 03:29:26 +0200
Subject: [PATCH] MC-94186 Fix dragon egg falling in lazy chunks
Fixes falling dragon eggs in lazy chunks fall to the block below the last empty block and replacing that block with them.
See also https://bugs.mojang.com/browse/MC-94186
diff --git a/src/main/java/net/minecraft/server/BlockDragonEgg.java b/src/main/java/net/minecraft/server/BlockDragonEgg.java
index ce186f825..291342c90 100644
--- a/src/main/java/net/minecraft/server/BlockDragonEgg.java
+++ b/src/main/java/net/minecraft/server/BlockDragonEgg.java
@@ -44,7 +44,7 @@ public class BlockDragonEgg extends Block {
}
if (blockposition1.getY() > 0) {
- world.setTypeAndData(blockposition1, this.getBlockData(), 2);
+ world.setTypeAndData(blockposition1.up(), this.getBlockData(), 2); // Paper
}
}
--
2.18.0