Scissors/patches/removed/server/0007-Ignore-errors-thrown-when-trying-to-remove-minecart-.patch

25 lines
1.3 KiB
Diff
Raw Normal View History

2022-07-28 03:57:50 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Video <videogamesm12@gmail.com>
Date: Sun, 13 Mar 2022 08:14:44 -0600
2022-07-28 03:57:50 +00:00
Subject: [PATCH] Ignore errors thrown when trying to remove minecart entities
with content in them
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
index 272095d7a09ab41227d741172735f66fd2798ce1..757ae1773ba35c2348483dddbb231060afafc602 100644
2022-07-28 03:57:50 +00:00
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.java
@@ -139,7 +139,11 @@ public abstract class AbstractMinecartContainer extends AbstractMinecart impleme
2022-07-28 03:57:50 +00:00
@Override
public void remove(Entity.RemovalReason reason) {
2023-06-09 00:58:46 +00:00
if (!this.level().isClientSide && reason.shouldDestroy()) {
- Containers.dropContents(this.level(), (Entity) this, (Container) this);
2022-07-28 03:57:50 +00:00
+ // Scissors start - Ignore errors thrown when trying to remove minecart entities with content in them
+ try {
2023-06-09 00:58:46 +00:00
+ Containers.dropContents(this.level(), (Entity) this, (Container) this);
+ } catch (Exception ignored) {}
2022-07-28 03:57:50 +00:00
+ // Scissors end
}
super.remove(reason);