2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2021-09-20 11:30:04 +02:00
|
|
|
From: Madeline Miller <mnmiller1@me.com>
|
2021-06-11 14:02:28 +02:00
|
|
|
Date: Thu, 31 Dec 2020 12:48:19 +1000
|
2024-01-19 22:13:42 +01:00
|
|
|
Subject: [PATCH] API to get Material from Boats and Minecarts
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2024-10-25 17:08:48 +02:00
|
|
|
== AT ==
|
|
|
|
public net.minecraft.world.entity.vehicle.AbstractBoat getDropItem()Lnet/minecraft/world/item/Item;
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
|
2024-10-25 12:30:19 +02:00
|
|
|
index c101d01b55472efc9fc2829b8c17db5377ed57ff..5d51a49228eaee94f91cd04843e27c7918ca8796 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
|
2024-10-23 17:58:11 +02:00
|
|
|
@@ -78,6 +78,13 @@ public abstract class CraftBoat extends CraftVehicle implements Boat {
|
2021-06-14 20:50:22 +02:00
|
|
|
this.getHandle().landBoats = workOnLand;
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
2021-06-14 20:50:22 +02:00
|
|
|
+ public org.bukkit.Material getBoatMaterial() {
|
2022-08-01 15:02:23 +02:00
|
|
|
+ return org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(this.getHandle().getDropItem());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
2022-07-12 19:16:05 +02:00
|
|
|
public Status getStatus() {
|
|
|
|
return CraftBoat.boatStatusFromNms(this.getHandle().status);
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
|
2024-11-04 18:42:38 +01:00
|
|
|
index c4db7c00c66e064993b8b2158f226d063eea798c..8192ccb01ed4efe9e987cab94952c172ed876581 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
|
2024-11-04 18:42:38 +01:00
|
|
|
@@ -4,6 +4,7 @@ import net.minecraft.server.level.ServerLevel;
|
2021-06-11 14:02:28 +02:00
|
|
|
import net.minecraft.world.entity.vehicle.AbstractMinecart;
|
|
|
|
import net.minecraft.world.level.block.Blocks;
|
|
|
|
import net.minecraft.world.level.block.state.BlockState;
|
|
|
|
+import org.bukkit.Material; // Paper
|
|
|
|
import org.bukkit.block.data.BlockData;
|
|
|
|
import org.bukkit.craftbukkit.CraftServer;
|
|
|
|
import org.bukkit.craftbukkit.block.data.CraftBlockData;
|
2024-11-04 18:42:38 +01:00
|
|
|
@@ -69,6 +70,24 @@ public abstract class CraftMinecart extends CraftVehicle implements Minecart {
|
2021-06-14 20:50:22 +02:00
|
|
|
this.getHandle().setDerailedVelocityMod(derailed);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public Material getMinecartMaterial() {
|
2024-10-25 17:08:48 +02:00
|
|
|
+ return CraftMagicNumbers.getMaterial(minecartEntityTypeToMaterial(this.getHandle().getType()));
|
|
|
|
+ }
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-10-25 17:08:48 +02:00
|
|
|
+ static net.minecraft.world.item.Item minecartEntityTypeToMaterial(final net.minecraft.world.entity.EntityType<?> type) {
|
|
|
|
+ if (type == net.minecraft.world.entity.EntityType.MINECART) return net.minecraft.world.item.Items.MINECART;
|
|
|
|
+ else if (type == net.minecraft.world.entity.EntityType.CHEST_MINECART) return net.minecraft.world.item.Items.CHEST_MINECART;
|
|
|
|
+ else if (type == net.minecraft.world.entity.EntityType.FURNACE_MINECART) return net.minecraft.world.item.Items.FURNACE_MINECART;
|
|
|
|
+ else if (type == net.minecraft.world.entity.EntityType.SPAWNER_MINECART) return net.minecraft.world.item.Items.MINECART;
|
|
|
|
+ else if (type == net.minecraft.world.entity.EntityType.COMMAND_BLOCK_MINECART) return net.minecraft.world.item.Items.COMMAND_BLOCK_MINECART;
|
|
|
|
+ else if (type == net.minecraft.world.entity.EntityType.HOPPER_MINECART) return net.minecraft.world.item.Items.HOPPER_MINECART;
|
|
|
|
+ else if (type == net.minecraft.world.entity.EntityType.TNT_MINECART) return net.minecraft.world.item.Items.TNT_MINECART;
|
|
|
|
+ else throw new UnsupportedOperationException("Server implementation is missing minecart material binding for entity type " + type.toShortString());
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public AbstractMinecart getHandle() {
|
2023-10-27 01:34:58 +02:00
|
|
|
return (AbstractMinecart) this.entity;
|