mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-15 07:01:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
684bd2adbc
Paper/Spigot-Server-Patches/0071-Pass-world-to-Village-creation.patch

37 lines
1.5 KiB
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes: 1cf8b5dc SPIGOT-4400: Populators running on existing chunks 116cb9a1 SPIGOT-4399: Add attribute modifier equality test 5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag
2018-09-29 07:31:59 +08:00
From 4794e17198632431883eba3787fdbbf99df2f43b Mon Sep 17 00:00:00 2001
Fixes #95 - Vanilla bug with Villages
2016-03-20 03:21:39 +08:00
From: Aikar <aikar@aikar.co>
Date: Sat, 19 Mar 2016 15:16:54 -0400
Subject: [PATCH] Pass world to Village creation
fixes NPE bug #95
diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-09-01 06:56:57 +08:00
index d58f6b2a86..d14a9e3a3e 100644
Fixes #95 - Vanilla bug with Villages
2016-03-20 03:21:39 +08:00
--- a/src/main/java/net/minecraft/server/PersistentVillage.java
+++ b/src/main/java/net/minecraft/server/PersistentVillage.java
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-09-01 06:56:57 +08:00
@@ -202,7 +202,7 @@ public class PersistentVillage extends PersistentBase {
Fixes #95 - Vanilla bug with Villages
2016-03-20 03:21:39 +08:00
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-09-01 06:56:57 +08:00
for(int i = 0; i < nbttaglist.size(); ++i) {
NOT FINISHED!!! Current Progress on 1.13-pre7 update This work is 100% unfinished. I am pushing it up so that we as a team can work on this update. Do not try to use this branch. You will fail.
2018-07-15 09:53:17 +08:00
NBTTagCompound nbttagcompound1 = nbttaglist.getCompound(i);
Fixes #95 - Vanilla bug with Villages
2016-03-20 03:21:39 +08:00
- Village village = new Village();
+ Village village = new Village(world); // Paper
village.a(nbttagcompound1);
this.villages.add(village);
Switch to using ForgeFlower for Paper Only mc-dev imports ForgeFlower is better than Spigots FernFlower at decompiling the source. However, in order to maintain the CraftBukkit patches, we must keep using spigots for the primary. However, for any file that we import on top of Spigots imported files there is nothing stopping us from using better decompiled files. So these changes will use ForgeFlower to maintain a better set of decomped files, so anything we add on top of Paper can start off in a better spot.
2018-09-01 06:56:57 +08:00
}
Fixes #95 - Vanilla bug with Villages
2016-03-20 03:21:39 +08:00
diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
Paper 1.13.1 Update Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
2018-08-27 02:11:49 +08:00
index f87e8e05af..bda67faefe 100644
Fixes #95 - Vanilla bug with Villages
2016-03-20 03:21:39 +08:00
--- a/src/main/java/net/minecraft/server/Village.java
+++ b/src/main/java/net/minecraft/server/Village.java
Update Paper to MC 1.11
2016-11-17 10:23:38 +08:00
@@ -24,7 +24,7 @@ public class Village {
Update to Minecraft 1.10
2016-06-09 11:57:14 +08:00
private final List<Village.Aggressor> k;
Fixes #95 - Vanilla bug with Villages
2016-03-20 03:21:39 +08:00
private int l;
- public Village() {
+ private Village() { // Paper - Nothing should call this - world needs to be set.
this.c = BlockPosition.ZERO;
this.d = BlockPosition.ZERO;
Update Paper to MC 1.11
2016-11-17 10:23:38 +08:00
this.j = Maps.newHashMap();
Fixes #95 - Vanilla bug with Villages
2016-03-20 03:21:39 +08:00
--
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes: 1cf8b5dc SPIGOT-4400: Populators running on existing chunks 116cb9a1 SPIGOT-4399: Add attribute modifier equality test 5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag
2018-09-29 07:31:59 +08:00
2.19.0
Fixes #95 - Vanilla bug with Villages
2016-03-20 03:21:39 +08:00
Reference in New Issue Copy Permalink