Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 1.9.4 #1

Merged
merged 4 commits into from
May 16, 2016
Merged

Update to 1.9.4 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4732ea9
Update .classpath
Darunia18 May 16, 2016
ddb582b
Update Commands.java
Darunia18 May 16, 2016
ec25198
Update MyHorse.java
Darunia18 May 16, 2016
adf3640
Update plugin.yml
Darunia18 May 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<classpathentry kind="lib" path="C:/CloudStation/minecraft/plugins/MyHorse/lib/PermissionsEx-1.23.1.jar"/>
<classpathentry kind="lib" path="C:/CloudStation/minecraft/plugins/MyHorse/lib/Vault.jar"/>
<classpathentry kind="lib" path="C:/CloudStation/minecraft/plugins/MyHorse/lib/zPermissions-1.2a.jar"/>
<classpathentry kind="lib" path="C:/CloudStation/minecraft/plugins/Werewolf/lib/spigot-api-1.9-R0.1-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="C:/CloudStation/minecraft/plugins/Werewolf/lib/spigot-1.9-R0.1-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="C:/CloudStation/minecraft/plugins/Werewolf/lib/spigot-api-1.9-R0.2-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="C:/CloudStation/minecraft/plugins/Werewolf/lib/spigot-1.9-R0.2-SNAPSHOT.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
10 changes: 5 additions & 5 deletions src/com/dogonfire/myhorse/Commands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
import java.util.List;
import java.util.UUID;
import net.milkbowl.vault.economy.Economy;
import net.minecraft.server.v1_9_R1.EntityLiving;
import net.minecraft.server.v1_9_R1.EntityPlayer;
import net.minecraft.server.v1_9_R1.NBTTagCompound;
import net.minecraft.server.v1_9_R2.EntityLiving;
import net.minecraft.server.v1_9_R2.EntityPlayer;
import net.minecraft.server.v1_9_R2.NBTTagCompound;
import org.apache.commons.lang.StringUtils;

import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_9_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.v1_9_R2.entity.CraftPlayer;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Horse;
Expand Down
4 changes: 2 additions & 2 deletions src/com/dogonfire/myhorse/MyHorse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class MyHorse extends JavaPlugin
private Economy economy = null;
public int maxHorsesPrPlayer = 3;

public static final String NMS = "v1_9_R1";
public static final String NMS = "v1_9_R2";

public boolean isCombatibleServer()
{
Expand Down Expand Up @@ -439,4 +439,4 @@ public boolean isDamageProtection(EntityDamageEvent.DamageCause damage)
{
return this.damageProtection.contains(damage);
}
}
}
4 changes: 2 additions & 2 deletions src/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: MyHorse
main: com.dogonfire.myhorse.MyHorse
author: DogOnFire
version: 0.3.3
version: 0.3.4
description: Horse Control for Minecraft!
website: http://dev.bukkit.org/server-mods/myhorse
softdepend: [PermissionsBukkit, PermissionsEx, bPermissions, GroupManager, Vault, Multiverse-Core]
Expand Down Expand Up @@ -119,4 +119,4 @@ permissions:
default: true
myhorse.help:
description: Allows player to see the help page
default: true
default: true