Update Upstream

This commit is contained in:
tr7zw 2020-04-06 23:09:37 +02:00
parent 2c1efb1c23
commit 109e463282
2 changed files with 4 additions and 4 deletions

@ -1 +1 @@
Subproject commit 0f7d3873ed3cf09b42c1bbaa95a36f7a994b82a5
Subproject commit c5b3aa72649479d22fb73f58a5e016998fe8de18

View File

@ -1,4 +1,4 @@
From b3711fd5393f407b2a83e00f6b027e85dfffb45b Mon Sep 17 00:00:00 2001
From 14715151b029eabc3faa87b4bf8c081eb3839a79 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Sun, 29 Mar 2020 01:59:27 +0100
Subject: [PATCH] Add option for pushable TileEntities
@ -669,10 +669,10 @@ index 000000000..b32f23198
+}
\ 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
index c340578e8..e343d1dc6 100644
index 2cb38d36c..da5dfe1c6 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -310,6 +310,13 @@ public class WorldServer extends World {
@@ -320,6 +320,13 @@ public class WorldServer extends World {
if (type instanceof ITileEntity) {
TileEntity replacement = ((ITileEntity) type).createTile(this);