Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-14 14:45:31 +01:00
Code Issues Projects Releases Wiki Activity

update to MC version 1.7.5

Browse Source
This commit is contained in:
unknown 2014-04-04 08:28:43 +02:00
parent eccf82b733
commit 50f772d142
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/dre/dungeonsxl/DPlayer.java
View File

@ -14,6 +14,7 @@ import org.bukkit.block.Block;
import org.bukkit.event.block.SignChangeEvent;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Damageable;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.entity.Wolf;
@ -62,8 +63,10 @@ public class DPlayer {
this.player = player;
this.world = world;
double health = ((Damageable) player).getHealth();
this.savePlayer = new DSavePlayer(player.getName(), player.getUniqueId().toString(), player.getLocation(), player.getInventory().getContents(), player.getInventory().getArmorContents(), player.getLevel(),
player.getTotalExperience(), (int) player.getHealth(), player.getFoodLevel(), player.getFireTicks(), player.getGameMode(), player.getActivePotionEffects());
player.getTotalExperience(), (int) health, player.getFoodLevel(), player.getFireTicks(), player.getGameMode(), player.getActivePotionEffects());
this.player.getInventory().clear();
this.player.getInventory().setArmorContents(null);
@ -325,7 +328,9 @@ public class DPlayer {
this.wolf = (Wolf) this.world.spawnEntity(this.player.getLocation(), EntityType.WOLF);
this.wolf.setTamed(true);
this.wolf.setOwner(this.player);
this.wolf.setHealth(this.wolf.getMaxHealth());
double maxHealth = ((Damageable) wolf).getMaxHealth();
this.wolf.setHealth(maxHealth);
}
/* Delete Inventory */

10
src/com/dre/dungeonsxl/P.java
View File

@ -10,9 +10,9 @@ import java.nio.channels.FileChannel;
import java.util.concurrent.CopyOnWriteArrayList;
import net.milkbowl.vault.permission.Permission;
import net.minecraft.server.v1_7_R1.EntityPlayer;
import net.minecraft.server.v1_7_R1.MinecraftServer;
import net.minecraft.server.v1_7_R1.PlayerInteractManager;
import net.minecraft.server.v1_7_R2.EntityPlayer;
import net.minecraft.server.v1_7_R2.MinecraftServer;
import net.minecraft.server.v1_7_R2.PlayerInteractManager;
import net.minecraft.util.com.mojang.authlib.GameProfile;
import org.apache.commons.lang.math.NumberUtils;
@ -22,8 +22,8 @@ import org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.craftbukkit.v1_7_R1.CraftServer;
import org.bukkit.craftbukkit.v1_7_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_7_R2.CraftServer;
import org.bukkit.craftbukkit.v1_7_R2.CraftWorld;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;