geforkt von Mirrors/Paper
b58063a949
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 607ce370 SPIGOT-7069: Material.BARREL has Directional data class, should also be Openable f14cea82 SPIGOT-7070: Material.SCULK_VEIN has Waterlogged data class, should also be MultipleFacing 8e43b278 PR-767: Add support checking/survivability methods for BlockData b3dee151 SPIGOT-7083: Add Boat.WoodenType, Boat.Status; deprecate TreeSpecies CraftBukkit Changes: 9a8e08010 SPIGOT-7069: Material.BARREL has Directional data class, should also be Openable 26bd88ccd SPIGOT-7070: Material.SCULK_VEIN has Waterlogged data class, should also be MultipleFacing 7ba06e15b SPIGOT-7095: StructureGrowEvent doesn't fire for mangrove propagules growing to a tree 163e35c91 PR-1079: Add support checking/survivability methods for BlockData 4230f8f0e SPIGOT-7083: Add Boat.WoodenType, Boat.Status; deprecate TreeSpecies Spigot Changes: 14a2382f Rebuild patches
63 Zeilen
2.6 KiB
Diff
63 Zeilen
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Madeline Miller <mnmiller1@me.com>
|
|
Date: Thu, 31 Dec 2020 12:48:19 +1000
|
|
Subject: [PATCH] Implement API to get Material from Boats and Minecarts
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
|
|
index 5871cd149fe07e97c5d68ffd83dae4d3fc6bcf03..40debf1130a8e6cc9510061976a01050cd8ddc05 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftBoat.java
|
|
@@ -80,6 +80,13 @@ public class CraftBoat extends CraftVehicle implements Boat {
|
|
this.getHandle().landBoats = workOnLand;
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public org.bukkit.Material getBoatMaterial() {
|
|
+ return this.getBoatType().getMaterial();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public Status getStatus() {
|
|
return CraftBoat.boatStatusFromNms(this.getHandle().status);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
|
|
index 053112d7411caa6f439bd344e74aff8c844d93ac..067fcc1f44d59dd675a9cc5485234c87366ffe10 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java
|
|
@@ -1,8 +1,10 @@
|
|
package org.bukkit.craftbukkit.entity;
|
|
|
|
import net.minecraft.world.entity.vehicle.AbstractMinecart;
|
|
+import net.minecraft.world.item.Items; // Paper
|
|
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;
|
|
@@ -68,6 +70,22 @@ public abstract class CraftMinecart extends CraftVehicle implements Minecart {
|
|
this.getHandle().setDerailedVelocityMod(derailed);
|
|
}
|
|
|
|
+ // Paper start
|
|
+ @Override
|
|
+ public Material getMinecartMaterial() {
|
|
+ net.minecraft.world.item.Item minecartItem = switch (getHandle().getMinecartType()) {
|
|
+ case CHEST -> Items.CHEST_MINECART;
|
|
+ case FURNACE -> Items.FURNACE_MINECART;
|
|
+ case TNT -> Items.TNT_MINECART;
|
|
+ case HOPPER -> Items.HOPPER_MINECART;
|
|
+ case COMMAND_BLOCK -> Items.COMMAND_BLOCK_MINECART;
|
|
+ case RIDEABLE, SPAWNER -> Items.MINECART;
|
|
+ };
|
|
+
|
|
+ return CraftMagicNumbers.getMaterial(minecartItem);
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
@Override
|
|
public AbstractMinecart getHandle() {
|
|
return (AbstractMinecart) entity;
|