Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-22 10:35:42 +01:00
Code Issues Projects Releases Wiki Activity

Update nbt-api, fix build

Browse Source
This commit is contained in:
tr7zw 2020-04-11 17:03:40 +02:00
parent ad0d6e2fb2
commit 08895a02d2
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/api/0033-Add-NBT-API-as-first-class-lib.patch
View File

@ -1,4 +1,4 @@
From 260c7f99167242e6cdfb9de6fca8baea3c9f48d2 Mon Sep 17 00:00:00 2001
From 14887dde8be6d1be22d5183285d1abfd377268a5 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Thu, 2 Apr 2020 18:49:56 +0200
Subject: [PATCH] Add NBT-API as first-class lib
@ -11,7 +11,7 @@ Subject: [PATCH] Add NBT-API as first-class lib
4 files changed, 56 insertions(+)
diff --git a/pom.xml b/pom.xml
index d9fb880ff..96e0a3511 100644
index d9fb880ff..99307b99c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,11 @@
@ -33,7 +33,7 @@ index d9fb880ff..96e0a3511 100644
+ <dependency>
+ <groupId>de.tr7zw</groupId>
+ <artifactId>item-nbt-api</artifactId>
+ <version>2.3.1</version>
+ <version>2.3.2</version>
+ </dependency>
</dependencies>

22
patches/server/0032-EMC-Fix-Bukkit.createInventory-with-type-LECTERN.patch
View File

@ -1,4 +1,4 @@
From de39653cc130b330c6feb5786a426f0e72ebc3a8 Mon Sep 17 00:00:00 2001
From d13aae1ed7987bef8f932dce5e9dfed8401c8dc9 Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Fri, 16 Aug 2019 22:18:35 -0400
Subject: [PATCH] EMC Fix Bukkit.createInventory() with type LECTERN
@ -23,9 +23,9 @@ This patch is licensed under the MIT License.
License: https://opensource.org/licenses/MIT
---
.../net/minecraft/server/TileEntityLectern.java | 14 +++++++++++---
.../craftbukkit/entity/CraftHumanEntity.java | 5 +++++
.../craftbukkit/entity/CraftHumanEntity.java | 6 ++++++
.../util/CraftTileInventoryConverter.java | 13 ++++++++++++-
3 files changed, 28 insertions(+), 4 deletions(-)
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/main/java/net/minecraft/server/TileEntityLectern.java b/src/main/java/net/minecraft/server/TileEntityLectern.java
index 6c2b48bdb..ab1c15e0d 100644
@ -95,16 +95,24 @@ index 6c2b48bdb..ab1c15e0d 100644
if (this.world != null) BlockLectern.a(this.getWorld(), this.getPosition(), this.getBlock()); // CraftBukkit
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 5dfa8eb79..e949b8693 100644
index 5dfa8eb79..d0069cfe5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -317,6 +317,11 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -31,6 +31,7 @@ import net.minecraft.server.PacketPlayInCloseWindow;
import net.minecraft.server.PacketPlayOutOpenWindow;
import net.minecraft.server.TileEntity;
import net.minecraft.server.TileEntityContainer;
+import net.minecraft.server.TileEntityLectern.LecternInventory;
import net.minecraft.server.Vec3D;
import org.bukkit.GameMode;
import org.bukkit.Location;
@@ -317,6 +318,11 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
if (craft.getInventory() instanceof ITileInventory) {
iinventory = (ITileInventory) craft.getInventory();
}
+ // EMC start
+ if (craft.getInventory() instanceof TileEntityLectern.LecternInventory) {
+ iinventory = ((TileEntityLectern.LecternInventory)craft.getInventory()).getLectern();
+ if (craft.getInventory() instanceof LecternInventory) {
+ iinventory = ((LecternInventory)craft.getInventory()).getLectern();
+ }
+ // EMC end
}