mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 19:37:35 +01:00
8ed2992da9
Portion of diff was dropped in the mappings update commit. Also remove the option to remove invalid statistics. The server will automatically do this now as of... 1.13?, our option wasn't even doing anything.
66 lines
2.9 KiB
Diff
66 lines
2.9 KiB
Diff
From 85ec0814325c3a54b11db44f173f4239975d47fb Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 10 Dec 2016 16:24:06 -0500
|
|
Subject: [PATCH] Improve the Saddle API for Horses
|
|
|
|
Not all horses with Saddles have armor. This lets us break up the horses with saddles
|
|
and access their saddle state separately from an interface shared with Armor.
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
|
index 14d041680..e56bef334 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
|
@@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract;
|
|
import org.apache.commons.lang.Validate;
|
|
import org.bukkit.craftbukkit.CraftServer;
|
|
import org.bukkit.craftbukkit.inventory.CraftInventoryAbstractHorse;
|
|
+import org.bukkit.craftbukkit.inventory.CraftSaddledInventory;
|
|
import org.bukkit.entity.AbstractHorse;
|
|
import org.bukkit.entity.AnimalTamer;
|
|
import org.bukkit.entity.Horse;
|
|
@@ -92,6 +93,6 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
|
|
|
|
@Override
|
|
public AbstractHorseInventory getInventory() {
|
|
- return new CraftInventoryAbstractHorse(getHandle().inventoryChest);
|
|
+ return new CraftSaddledInventory(getHandle().inventoryChest);
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
|
|
index 173818e68..2f6852404 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
|
|
@@ -4,7 +4,7 @@ import net.minecraft.server.IInventory;
|
|
import org.bukkit.inventory.HorseInventory;
|
|
import org.bukkit.inventory.ItemStack;
|
|
|
|
-public class CraftInventoryHorse extends CraftInventoryAbstractHorse implements HorseInventory {
|
|
+public class CraftInventoryHorse extends CraftSaddledInventory implements HorseInventory {
|
|
|
|
public CraftInventoryHorse(IInventory inventory) {
|
|
super(inventory);
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
|
|
new file mode 100644
|
|
index 000000000..99cfbaf90
|
|
--- /dev/null
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
|
|
@@ -0,0 +1,15 @@
|
|
+package org.bukkit.craftbukkit.inventory;
|
|
+
|
|
+import net.minecraft.server.IInventory;
|
|
+
|
|
+import org.bukkit.inventory.AbstractHorseInventory;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.bukkit.inventory.SaddledHorseInventory;
|
|
+
|
|
+public class CraftSaddledInventory extends CraftInventoryAbstractHorse implements SaddledHorseInventory {
|
|
+
|
|
+ public CraftSaddledInventory(IInventory inventory) {
|
|
+ super(inventory);
|
|
+ }
|
|
+
|
|
+}
|
|
--
|
|
2.20.0
|
|
|