mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-11-01 12:37:10 +00:00
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Video <videogamesm12@gmail.com>
|
|
Date: Sun, 13 Mar 2022 08:14:44 -0600
|
|
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
|
|
--- 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
|
|
@Override
|
|
public void remove(Entity.RemovalReason reason) {
|
|
if (!this.level().isClientSide && reason.shouldDestroy()) {
|
|
- Containers.dropContents(this.level(), (Entity) this, (Container) this);
|
|
+ // Scissors start - Ignore errors thrown when trying to remove minecart entities with content in them
|
|
+ try {
|
|
+ Containers.dropContents(this.level(), (Entity) this, (Container) this);
|
|
+ } catch (Exception ignored) {}
|
|
+ // Scissors end
|
|
}
|
|
|
|
super.remove(reason);
|