Move getTypeIfLoaded and friends to IBlockAccess (#2077)

This commit is contained in:
Spottedleaf
2019-05-26 23:14:14 -07:00
committed by Zach
parent 90141ff411
commit 5dc46cd3b2
139 changed files with 508 additions and 370 deletions

View File

@@ -1,4 +1,4 @@
From 81d58874be226a14cbcb3a3049e39fb8a21382d6 Mon Sep 17 00:00:00 2001
From f2d0e742169ec0b8a62b4cb6295afefaba70894c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jul 2018 14:27:34 -0400
Subject: [PATCH] Duplicate UUID Resolve Option
@@ -81,10 +81,10 @@ index ef882b897f..385b3ac0ce 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 836b012474..c70c84c2a4 100644
index 1ba855786c..1bbac46f6a 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -385,6 +385,7 @@ public class Chunk implements IChunkAccess {
@@ -397,6 +397,7 @@ public class Chunk implements IChunkAccess {
if (i != this.loc.x || j != this.loc.z) {
Chunk.LOGGER.warn("Wrong location! ({}, {}) should be ({}, {}), {}", i, j, this.loc.x, this.loc.z, entity);
entity.dead = true;