core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Potion Equals Bug 

Will be in Spigot 1.10, but getting it in for 1.9 users
This commit is contained in:
chickeneer 2016-06-08 20:41:10 -04:00 committed by Aikar
parent 3201cfe07a
commit 171a079cd2
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Spigot-Server-Patches/0165-Fix-Potion-Equals-Bug.patch Normal file
View File

@ -0,0 +1,35 @@
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