Update upstream

2017-06-25 20:26:00 -04:00
parent b8fb29dc77
commit 46e300045a
3 changed files with 4 additions and 25 deletions
--- a/Spigot-API-Patches/SPIGOT-3381-Alias-SWEEPING-to-SWEEPING_EDGE.patch
+++ b/Spigot-API-Patches/SPIGOT-3381-Alias-SWEEPING-to-SWEEPING_EDGE.patch
@@ -1,21 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 25 Jun 2017 19:38:09 -0400
-Subject: [PATCH] SPIGOT-3381: Alias SWEEPING to SWEEPING_EDGE
-
-
-diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index ac3a7f99..448fd8f8 100644
--- a/src/main/java/org/bukkit/enchantments/Enchantment.java
-+++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
-@@ -0,0 +0,0 @@ public abstract class Enchantment {
-      * @return Resulting Enchantment, or null if not found
-      */
-     public static Enchantment getByName(String name) {
-+        if ("SWEEPING".equals(name)) {
-+            name = "SWEEPING_EDGE";
-+        }
-         return byName.get(name);
-     }
- 
--