TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix conflicts

Browse source
This commit is contained in:
md_5 2014-03-24 17:12:40 +11:00
parent 1d54735aa4
commit 3c4481aa87
2 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CraftBukkit-Patches/0124-Cap-villagers-window-name-to-prevent-client-disconne.patch → CraftBukkit-Patches/0123-Cap-villagers-window-name-to-prevent-client-disconne.patch
View file

@ -1,4 +1,4 @@
From 03fb61c80cb0e990d94dce744ab2cc8899231ea3 Mon Sep 17 00:00:00 2001 From 8692b48890a732c5729f50d1f1729da8711834b7 Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com> From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sun, 23 Mar 2014 10:53:48 +0000 Date: Sun, 23 Mar 2014 10:53:48 +0000
Subject: [PATCH] Cap villagers' window name to prevent client disconnects Subject: [PATCH] Cap villagers' window name to prevent client disconnects
@ -17,5 +17,5 @@ index 787c764..5788872 100644
MerchantRecipeList merchantrecipelist = imerchant.getOffers(this); MerchantRecipeList merchantrecipelist = imerchant.getOffers(this);
-- --
1.8.5.2.msysgit.0 1.8.3.2

22
CraftBukkit-Patches/0123-Fix-the-removal-of-potion-effects.patch
View file

@ -1,22 +0,0 @@
From 1b2806d422da014c43d5be4fc2bc3c58a677614f Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thethinkofdeath@gmail.com>
Date: Sun, 23 Mar 2014 09:47:24 +0000
Subject: [PATCH] Fix the removal of potion effects
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index c1f1782..8d8a4ec 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -280,7 +280,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
}
public void removePotionEffect(PotionEffectType type) {
- getHandle().m(type.getId()); // Should be removeEffect.
+ getHandle().removeEffect(type.getId()); // Spigot - Fix mapping
}
public Collection<PotionEffect> getActivePotionEffects() {
--
1.8.5.2.msysgit.0