summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-21 15:40:06 +0000
committerementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-05-21 15:40:06 +0000
commit9839ced07d556009bd14b0a87213d35e5ff0dc00 (patch)
treec9a9c99a53c33f8a31ff11849590ee7bbc938397
parentd9cb5da09acc684aebcaadbab941c1137685a544 (diff)
downloadEssentials-9839ced07d556009bd14b0a87213d35e5ff0dc00.tar
Essentials-9839ced07d556009bd14b0a87213d35e5ff0dc00.tar.gz
Essentials-9839ced07d556009bd14b0a87213d35e5ff0dc00.tar.lz
Essentials-9839ced07d556009bd14b0a87213d35e5ff0dc00.tar.xz
Essentials-9839ced07d556009bd14b0a87213d35e5ff0dc00.zip
[trunk] Recommended build #798
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1506 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/OfflinePlayer.java11
-rw-r--r--Essentials/src/com/earth2me/essentials/PlayerWrapper.java12
3 files changed, 24 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 9af6e10de..ea29711f4 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -43,7 +43,7 @@ import org.bukkit.plugin.java.*;
public class Essentials extends JavaPlugin
{
public static final String AUTHORS = "Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans and Xeology";
- public static final int minBukkitBuildVersion = 766;
+ public static final int minBukkitBuildVersion = 798;
private static final Logger logger = Logger.getLogger("Minecraft");
private Settings settings;
private EssentialsPlayerListener playerListener;
diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
index ab513d87b..28efab0ed 100644
--- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
+++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
@@ -16,6 +16,7 @@ import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Snowball;
import org.bukkit.entity.Vehicle;
+import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.util.Vector;
@@ -448,4 +449,14 @@ public class OfflinePlayer implements Player
{
throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
}
+
+ public void setLastDamageCause(EntityDamageEvent ede)
+ {
+ throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+ }
+
+ public EntityDamageEvent getLastDamageCause()
+ {
+ throw new UnsupportedOperationException(Util.i18n("notSupportedYet"));
+ }
}
diff --git a/Essentials/src/com/earth2me/essentials/PlayerWrapper.java b/Essentials/src/com/earth2me/essentials/PlayerWrapper.java
index 87a842fcd..9d1b64f88 100644
--- a/Essentials/src/com/earth2me/essentials/PlayerWrapper.java
+++ b/Essentials/src/com/earth2me/essentials/PlayerWrapper.java
@@ -5,6 +5,7 @@ import java.util.*;
import org.bukkit.*;
import org.bukkit.block.Block;
import org.bukkit.entity.*;
+import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.inventory.*;
import org.bukkit.util.Vector;
@@ -503,4 +504,15 @@ public class PlayerWrapper implements Player
{
base.sendBlockChange(lctn, i, b);
}
+
+ public void setLastDamageCause(EntityDamageEvent ede)
+ {
+ base.setLastDamageCause(ede);
+
+ }
+
+ public EntityDamageEvent getLastDamageCause()
+ {
+ return base.getLastDamageCause();
+ }
}