Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-26 12:45:52 +01:00
Code Issues Projects Releases Wiki Activity

Update Tuinity

Browse Source
This commit is contained in:
tr7zw 2020-04-09 14:46:41 +02:00
parent 3777bdadee
commit 12c8170d93
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tuinity

@ -1 +1 @@
Subproject commit 50dbf5ed09633a301b08f1b80f46852de29e99d8 Subproject commit cc29709571d07e26f3d9affd4a9291d55e11c848

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

@ -1,4 +1,4 @@
From 7d7efb440aa5deb8ef3d49b19fa8ac4b8666c0e2 Mon Sep 17 00:00:00 2001 From d540b974aa3d9220df3a984f7065d2dc3b39fbe1 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de> From: tr7zw <tr7zw@live.de>
Date: Thu, 2 Apr 2020 18:49:56 +0200 Date: Thu, 2 Apr 2020 18:49:56 +0200
Subject: [PATCH] Add NBT-API as first-class lib 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(+) 4 files changed, 56 insertions(+)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index d9fb880f..5af052e7 100644 index d9fb880ff..5af052e7f 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -44,6 +44,11 @@ @@ -44,6 +44,11 @@
@ -52,7 +52,7 @@ index d9fb880f..5af052e7 100644
</plugin> </plugin>
</plugins> </plugins>
diff --git a/src/main/java/org/bukkit/block/TileState.java b/src/main/java/org/bukkit/block/TileState.java diff --git a/src/main/java/org/bukkit/block/TileState.java b/src/main/java/org/bukkit/block/TileState.java
index 3b10fcc1..acb13596 100644 index 3b10fcc13..acb135968 100644
--- a/src/main/java/org/bukkit/block/TileState.java --- a/src/main/java/org/bukkit/block/TileState.java
+++ b/src/main/java/org/bukkit/block/TileState.java +++ b/src/main/java/org/bukkit/block/TileState.java
@@ -4,6 +4,8 @@ import org.bukkit.persistence.PersistentDataContainer; @@ -4,6 +4,8 @@ import org.bukkit.persistence.PersistentDataContainer;
@ -78,7 +78,7 @@ index 3b10fcc1..acb13596 100644
+ // YAPFA end + // YAPFA end
} }
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 5518ecd2..9c49b7fb 100644 index 511348bdb..add98eec7 100644
--- a/src/main/java/org/bukkit/entity/Entity.java --- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -23,6 +23,8 @@ import org.jetbrains.annotations.Contract; @@ -23,6 +23,8 @@ import org.jetbrains.annotations.Contract;
@ -90,7 +90,7 @@ index 5518ecd2..9c49b7fb 100644
/** /**
* Represents a base entity in the world * Represents a base entity in the world
*/ */
@@ -656,4 +658,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -661,4 +663,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@NotNull @NotNull
org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason(); org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
// Paper end // Paper end
@ -104,7 +104,7 @@ index 5518ecd2..9c49b7fb 100644
+ // YAPFA end + // YAPFA end
} }
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 291285aa..d2565839 100644 index 291285aa6..d25658392 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java --- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@

6
patches/server/0049-Add-option-for-pushable-TileEntities.patch
View File

@ -1,4 +1,4 @@
From 14715151b029eabc3faa87b4bf8c081eb3839a79 Mon Sep 17 00:00:00 2001 From a5aa917ab0f4e3a3f6442e0acaba61b834f561f6 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de> From: tr7zw <tr7zw@live.de>
Date: Sun, 29 Mar 2020 01:59:27 +0100 Date: Sun, 29 Mar 2020 01:59:27 +0100
Subject: [PATCH] Add option for pushable TileEntities Subject: [PATCH] Add option for pushable TileEntities
@ -669,10 +669,10 @@ index 000000000..b32f23198
+} +}
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 2cb38d36c..da5dfe1c6 100644 index 0f010dce2..e9f5f0b53 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java --- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -320,6 +320,13 @@ public class WorldServer extends World { @@ -318,6 +318,13 @@ public class WorldServer extends World {
if (type instanceof ITileEntity) { if (type instanceof ITileEntity) {
TileEntity replacement = ((ITileEntity) type).createTile(this); TileEntity replacement = ((ITileEntity) type).createTile(this);