AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-29 19:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.16, overhaul of player data

Browse Source
This commit is contained in:
Seth
2020-06-30 00:25:38 -07:00
parent 4ddcc3b8d7
commit eb58419a3a
95 changed files with 1553 additions and 3263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/me/totalfreedom/totalfreedommod/fun/ItemFun.java
View File

@ -5,20 +5,15 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
import javax.security.auth.login.FailedLoginException;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.player.FPlayer;
import me.totalfreedom.totalfreedommod.shop.ShopData;
import me.totalfreedom.totalfreedommod.player.PlayerData;
import me.totalfreedom.totalfreedommod.shop.ShopItem;
import me.totalfreedom.totalfreedommod.util.DepreciationAggregator;
import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Color;
import org.bukkit.FireworkEffect;
@ -287,7 +282,7 @@ public class ItemFun extends FreedomService
case BLAZE_ROD:
{
if (!plugin.sh.isRealItem(plugin.sh.getData(player), ShopItem.LIGHTNING_ROD, player.getInventory().getItemInMainHand(), plugin.sh.getLightningRod()))
if (!plugin.sh.isRealItem(plugin.pl.getData(player), ShopItem.LIGHTNING_ROD, player.getInventory().getItemInMainHand(), plugin.sh.getLightningRod()))
{
break;
}
@ -311,7 +306,7 @@ public class ItemFun extends FreedomService
case FIRE_CHARGE:
{
if (!plugin.sh.isRealItem(plugin.sh.getData(player), ShopItem.FIRE_BALL, player.getInventory().getItemInMainHand(), plugin.sh.getFireBall()))
if (!plugin.sh.isRealItem(plugin.pl.getData(player), ShopItem.FIRE_BALL, player.getInventory().getItemInMainHand(), plugin.sh.getFireBall()))
{
break;
}
@ -339,7 +334,7 @@ public class ItemFun extends FreedomService
if (entity instanceof EnderPearl && entity.getShooter() instanceof Player)
{
Player player = (Player)entity.getShooter();
if (plugin.sh.isRealItem(plugin.sh.getData(player), ShopItem.RIDEABLE_PEARL, player.getInventory().getItemInMainHand(), plugin.sh.getRideablePearl()))
if (plugin.sh.isRealItem(plugin.pl.getData(player), ShopItem.RIDEABLE_PEARL, player.getInventory().getItemInMainHand(), plugin.sh.getRideablePearl()))
{
entity.addPassenger(player);
}
@ -397,10 +392,10 @@ public class ItemFun extends FreedomService
public void onFish(PlayerFishEvent event)
{
Player player = event.getPlayer();
ShopData sd = plugin.sh.getData(player);
PlayerData data = plugin.pl.getData(player);
PlayerInventory inv = event.getPlayer().getInventory();
ItemStack rod = inv.getItemInMainHand();
if (plugin.sh.isRealItem(plugin.sh.getData(player), ShopItem.GRAPPLING_HOOK, player.getInventory().getItemInMainHand(), plugin.sh.getGrapplingHook()))
if (plugin.sh.isRealItem(plugin.pl.getData(player), ShopItem.GRAPPLING_HOOK, player.getInventory().getItemInMainHand(), plugin.sh.getGrapplingHook()))
{
if (event.getState() == PlayerFishEvent.State.REEL_IN || event.getState() == PlayerFishEvent.State.IN_GROUND)
{

71
src/main/java/me/totalfreedom/totalfreedommod/fun/RealTimer.java
View File

@ -1,71 +0,0 @@
package me.totalfreedom.totalfreedommod.fun;
import java.util.HashMap;
import java.util.Map;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitTask;
public class RealTimer extends FreedomService
{
public RealTimer(TotalFreedomMod plugin)
{
super(plugin);
}
private Map<Player, BukkitTask> tasks = new HashMap<>();
@Override
protected void onStart()
{
}
@Override
protected void onStop()
{
}
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerJoin(PlayerJoinEvent event)
{
enable(event.getPlayer());
}
@EventHandler(priority = EventPriority.MONITOR)
public void onPlayerQuit(PlayerQuitEvent event)
{
disable(event.getPlayer());
}
public void enable(Player player)
{
VPlayer vPlayer = plugin.pv.getVerificationPlayer(player);
if (vPlayer.isRealTime())
{
tasks.put(player, new BukkitRunnable()
{
@Override
public void run()
{
player.setPlayerTime(FUtil.getTimeInTicks(vPlayer.getUtcOffset()), false);
}
}.runTaskTimer(plugin, 0L, 20));
}
}
public void disable(Player player)
{
if (!tasks.containsKey(player))
return;
tasks.get(player).cancel();
tasks.remove(player);
}
}

5
src/main/java/me/totalfreedom/totalfreedommod/fun/Trailer.java
View File

@ -91,4 +91,9 @@ public class Trailer extends FreedomService
{
trailPlayers.add(player.getName());
}
public boolean contains(Player player)
{
return trailPlayers.contains(player.getName());
}
}