MC 1.14.1

This commit is contained in:
Zach Brown
2019-05-13 21:20:58 -05:00
parent d1310ddac5
commit 1ea2c3b4be
256 changed files with 762 additions and 787 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Prevent tile entity and entity crashes
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index da30d2cf86..acd9edd670 100644
index 095ef9ba5..b99bcbf8a 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -0,0 +0,0 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -23,11 +23,11 @@ index da30d2cf86..acd9edd670 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 119e011e2c..0afc34ac0e 100644
index f9f14cc1f..cfbe3d592 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
((ITickable) tileentity).tick();
gameprofilerfiller.exit();
} catch (Throwable throwable) {
- CrashReport crashreport = CrashReport.a(throwable, "Ticking block entity");
@@ -60,7 +60,7 @@ index 119e011e2c..0afc34ac0e 100644
+ entity.dead = true;
+ return;
+ // Paper end
}
// Spigot start
finally {
} finally {
entity.tickTimer.stopTiming();
timings.tickEntities.stopTiming();
--