mirror of
https://github.com/AtlasMediaGroup/Scissors.git
synced 2024-11-27 15:15:39 +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 6d23c39e4eadf23616080d6d08672e13b5d3c37d..0bd5c3e3bb7074b5265e3f1bf670f993c9fe167d 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);
|