JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mount stuff is fixed

Browse Source
This commit is contained in:
Cheese 2015-12-09 08:19:55 +11:00
parent 2decc049c5
commit fba88ec231
2 changed files with 51 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
View File

@ -75,7 +75,7 @@ public class MountCart extends Mount<SingleEntityMountData<Minecart>>
if (event.getRightClicked() == null) if (event.getRightClicked() == null)
return; return;
SingleEntityMountData<Minecart> mount = GetActive().get(event.getPlayer()); SingleEntityMountData<Minecart> mount = getMountData(event.getRightClicked());
if(mount == null) return; if(mount == null) return;

14
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountSlime.java
View File

@ -30,8 +30,8 @@ public class MountSlime extends Mount<SingleEntityMountData<Slime>>
{ {
super(manager, "Slime Mount", Material.SLIME_BALL, (byte)0, new String[] super(manager, "Slime Mount", Material.SLIME_BALL, (byte)0, new String[]
{ {
ChatColor.RESET + "Bounce around on your very", ChatColor.RESET + "Bounce around on your very",
ChatColor.RESET + "own personal slime friend!", ChatColor.RESET + "own personal slime friend!",
}, },
15000); 15000);
@ -78,11 +78,13 @@ public class MountSlime extends Mount<SingleEntityMountData<Slime>>
if (event.getRightClicked() == null) if (event.getRightClicked() == null)
return; return;
if (!GetActive().containsKey(event.getPlayer())) SingleEntityMountData<Slime> data = GetActive().get(event.getPlayer());
return;
if(!GetActive().get(event.getPlayer()).ownsMount(event.getPlayer())) if(data == null) return;
return;
if(!data.ownsMount(event.getPlayer())) return;
if(!data.isPartOfMount(event.getRightClicked())) return;
event.getPlayer().leaveVehicle(); event.getPlayer().leaveVehicle();
event.getPlayer().eject(); event.getPlayer().eject();