Misterzym
/
KCauldron-minecraft-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Unbeatable spawn protection

master
Robotia 9 years ago
parent
d1a058c2af
commit
713bfa49a3
1 changed files with 233 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 233
      patches/net/minecraftforge/event/ForgeEventFactory.java.patch

233
patches/net/minecraftforge/event/ForgeEventFactory.java.patch
Unescape View File

@ -0,0 +1,233 @@
--- ../src-base/minecraft/net/minecraftforge/event/ForgeEventFactory.java
+++ ../src-work/minecraft/net/minecraftforge/event/ForgeEventFactory.java
@@ -1,10 +1,12 @@
package net.minecraftforge.event;
import java.io.File;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.item.Item;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-
+import net.minecraftforge.cauldron.command.*;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.common.eventhandler.Event.Result;
import net.minecraft.block.Block;
@@ -70,8 +72,20 @@
return event;
}
+ public static boolean isSpawn(EntityPlayer ep)
+ {
+ return ep.worldObj.worldInfo.getWorldName().toLowerCase().contains("spawn");
+ }
+
public static boolean doPlayerHarvestCheck(EntityPlayer player, Block block, boolean success)
{
+ if (isSpawn(player) && nonVanilla(player))
+ {
+ if (CauldronCommand.debug)
+ System.out.println("Told player no harvest");
+ return false;
+ }
+
PlayerEvent.HarvestCheck event = new PlayerEvent.HarvestCheck(player, block, success);
MinecraftForge.EVENT_BUS.post(event);
return event.success;
@@ -80,25 +94,100 @@
@Deprecated // Location version below
public static float getBreakSpeed(EntityPlayer player, Block block, int metadata, float original)
{
+ if (isSpawn(player) && nonVanilla(player))
+ {
+ if (CauldronCommand.debug)
+ System.out.println("Told user breakspeed = 0");
+ return 0F;
+ }
+
return getBreakSpeed(player, block, metadata, original, 0, -1, 0);
}
public static float getBreakSpeed(EntityPlayer player, Block block, int metadata, float original, int x, int y, int z)
{
+ if (isSpawn(player) && nonVanilla(player))
+ {
+ if (CauldronCommand.debug)
+ System.out.println("Told user breakspeed = 0");
+ return 0F;
+ }
+
PlayerEvent.BreakSpeed event = new PlayerEvent.BreakSpeed(player, block, metadata, original, x, y, z);
return (MinecraftForge.EVENT_BUS.post(event) ? -1 : event.newSpeed);
}
+ private static boolean outsideOfVanillaRange(int id)
+ {
+ if (CauldronCommand.debug)
+ {
+ System.out.println("Testing item ID " + id);
+ }
+ return (id > 197 && !(id >= 256 && id <= 431) && !(id >= 2256 && id <= 2267))
+ && !( id == 628 || id == 5374 || id == 4568 || id == 4354 || id == 4355 || id == 4356
+ || (id >= 4324 && id <= 4329) || id == 4338 || id == 4688 || id == 4916 || (id <= 4987 && id>= 4980)
+ || id == 5386 || id == 753 || id == 5497 || id == 4096 || id == 550 || id == 4791 || id == 4790
+ || id == 564 || id == 562 || id == 555 || id == 4787 || id == 569 || id == 572 || id == 4749 || id == 4984
+ || id == 4568 || id == 220 || (id >= 4548 && id <= 4561) || (id >= 5360 && id <= 5365));
+ }
+
+ public static boolean nonVanilla(EntityPlayer ep)
+ {
+ if (ep == null)
+ {
+ if(CauldronCommand.debug)System.out.println("EntityPlayer is null");
+ return false;
+ }
+ if(ep.canCommandSenderUseCommand(4, "stop")) return false;
+ if (ep.getHeldItem() == null)
+ {
+ if (CauldronCommand.debug)
+ System.out.println("Held item is null");
+ return false;
+ }
+ if (ep.getHeldItem().getItem() == null)
+ {
+ if(CauldronCommand.debug)System.out.println("Item getItem() is null");
+ return false;
+ }
+ if( outsideOfVanillaRange(Item.getIdFromItem(ep.getHeldItem().getItem())))
+ {
+ if(ep instanceof EntityPlayerMP)
+ {
+ EntityPlayerMP mp = (EntityPlayerMP)ep;
+ mp.addChatComponentMessage(new ChatComponentText("You cannot use that item here."));
+ }
+ return true;
+ }
+ return false;
+ }
+
@Deprecated
public static PlayerInteractEvent onPlayerInteract(EntityPlayer player, Action action, int x, int y, int z, int face)
{
- return onPlayerInteract(player, action, x, y, z, face, null);
+ PlayerInteractEvent event = new PlayerInteractEvent(player, action, x, y, z, face, null);
+ if (isSpawn(player) && nonVanilla(player))
+ {
+ event.setCanceled(true);
+ if (CauldronCommand.debug)
+ System.out.println("Canceled onPlayerInteract()");
+ } else
+ MinecraftForge.EVENT_BUS.post(event);
+ return event;
+
}
public static PlayerInteractEvent onPlayerInteract(EntityPlayer player, Action action, int x, int y, int z, int face, World world)
{
- PlayerInteractEvent event = new PlayerInteractEvent(player, action, x, y, z, face, world);
- MinecraftForge.EVENT_BUS.post(event);
- return event;
+ PlayerInteractEvent event = new PlayerInteractEvent(player, action, x, y, z, face, world);
+ if (isSpawn(player) && nonVanilla(player))
+ {
+ event.setCanceled(true);
+ if (CauldronCommand.debug)
+ System.out.println("Canceled onPlayerInteract()");
+ } else
+ MinecraftForge.EVENT_BUS.post(event);
+ return event;
+
}
public static void onPlayerDestroyItem(EntityPlayer player, ItemStack stack)
@@ -182,29 +271,63 @@
return MinecraftForge.EVENT_BUS.post(new EntityStruckByLightningEvent(entity, bolt));
}
- public static int onItemUseStart(EntityPlayer player, ItemStack item, int duration)
- {
- PlayerUseItemEvent event = new PlayerUseItemEvent.Start(player, item, duration);
- return MinecraftForge.EVENT_BUS.post(event) ? -1 : event.duration;
- }
-
- public static int onItemUseTick(EntityPlayer player, ItemStack item, int duration)
- {
- PlayerUseItemEvent event = new PlayerUseItemEvent.Tick(player, item, duration);
- return MinecraftForge.EVENT_BUS.post(event) ? -1 : event.duration;
- }
+ public static int onItemUseStart(EntityPlayer player, ItemStack item, int duration)
+ {
+ PlayerUseItemEvent event;
+ if (isSpawn(player) && nonVanilla(player))
+ {
+ event = new PlayerUseItemEvent.Start(player, null, duration);
+ if (CauldronCommand.debug)
+ System.out.println("Canceled onItemuseStart()");
+ } else
+ {
+ event = new PlayerUseItemEvent.Start(player, item, duration);
+ }
+ return MinecraftForge.EVENT_BUS.post(event) ? -1 : event.duration;
+ }
- public static boolean onUseItemStop(EntityPlayer player, ItemStack item, int duration)
- {
- return MinecraftForge.EVENT_BUS.post(new PlayerUseItemEvent.Stop(player, item, duration));
- }
+ public static int onItemUseTick(EntityPlayer player, ItemStack item, int duration)
+ {
+ PlayerUseItemEvent event;
+ if (isSpawn(player) && nonVanilla(player))
+ {
+ event = new PlayerUseItemEvent.Tick(player, null, duration);
+ if (CauldronCommand.debug)
+ System.out.println("Canceled onItemuseTick()");
+ } else
+ {
+ event = new PlayerUseItemEvent.Tick(player, item, duration);
+ }
+ return MinecraftForge.EVENT_BUS.post(event) ? -1 : event.duration;
+ }
+ public static boolean onUseItemStop(EntityPlayer player, ItemStack item, int duration)
+ {
+ PlayerUseItemEvent event;
+ if (isSpawn(player) && nonVanilla(player))
+ {
+ event = new PlayerUseItemEvent.Start(player, null, duration);
+ if (CauldronCommand.debug)
+ System.out.println("Canceled onItemuseStop()");
+ } else
+ {
+ event = new PlayerUseItemEvent.Start(player, item, duration);
+ }
+ return MinecraftForge.EVENT_BUS.post(event);
+ }
- public static ItemStack onItemUseFinish(EntityPlayer player, ItemStack item, int duration, ItemStack result)
- {
- PlayerUseItemEvent.Finish event = new PlayerUseItemEvent.Finish(player, item, duration, result);
- MinecraftForge.EVENT_BUS.post(event);
- return event.result;
- }
+ public static ItemStack onItemUseFinish(EntityPlayer player, ItemStack item, int duration, ItemStack result)
+ {
+ PlayerUseItemEvent.Finish event;
+ if (isSpawn(player) && nonVanilla(player))
+ {
+ event = new PlayerUseItemEvent.Finish(player, null, duration, null);
+ if (CauldronCommand.debug)
+ System.out.println("Canceled onItemuseFinish()");
+ } else
+ event = new PlayerUseItemEvent.Finish(player, item, duration, result);
+ MinecraftForge.EVENT_BUS.post(event);
+ return event.result;
+ }
public static void onStartEntityTracking(Entity entity, EntityPlayer player)
{
@@ -290,4 +413,4 @@
{
MinecraftForge.EVENT_BUS.post(new PotionBrewEvent.Post(brewingItemStacks));
}
-}
+}
Write Preview
Loading…
Cancel
Save