Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 04:20:04 +01:00
36 Zeilen
1.3 KiB
Diff
36 Zeilen
1.3 KiB
Diff
From 8804e12da0dc696a8280f2116118f8bbb233374a Mon Sep 17 00:00:00 2001
|
|
From: chickeneer <emcchickeneer@gmail.com>
|
|
Date: Wed, 8 Jun 2016 20:39:19 -0400
|
|
Subject: [PATCH] Fix Potion Equals Bug
|
|
|
|
Will be in Spigot 1.10, but getting it in for 1.9 users
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
|
|
index 5a8b77a..d7d3d92 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionUtil.java
|
|
@@ -58,13 +58,15 @@ public class CraftPotionUtil {
|
|
.build();
|
|
|
|
public static String fromBukkit(PotionData data) {
|
|
+ String type;
|
|
if (data.isUpgraded()) {
|
|
- return upgradeable.get(data.getType());
|
|
+ type = upgradeable.get(data.getType());
|
|
+ } else if (data.isExtended()) {
|
|
+ type = extendable.get(data.getType());
|
|
+ } else {
|
|
+ type = regular.get(data.getType());
|
|
}
|
|
- if (data.isExtended()) {
|
|
- return extendable.get(data.getType());
|
|
- }
|
|
- return regular.get(data.getType());
|
|
+ return "minecraft:" + type;
|
|
}
|
|
|
|
public static PotionData toBukkit(String type) {
|
|
--
|
|
2.8.4
|
|
|