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

Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex

This commit is contained in:
Chiss 2014-04-12 18:25:59 +10:00
parent ba1c6ae35f eb1d1c1ed2
commit ecc40bda47
7 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Plugins/Libraries/craftbukkit.jar
View File

Binary file not shown.

9
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R2/EntityFallingBlock.java
View File

@ -3,6 +3,7 @@ package net.minecraft.server.v1_7_R2;
import java.util.ArrayList;
import java.util.Iterator;
// CraftBukkit start
import org.bukkit.craftbukkit.v1_7_R2.event.CraftEventFactory;
import org.bukkit.event.entity.EntityDamageEvent;
@ -62,6 +63,14 @@ public class EntityFallingBlock extends Entity {
return !this.dead && !spectating;
}
@Override
public boolean damageEntity(DamageSource damagesource, float f)
{
CraftEventFactory.handleEntityDamageEvent(this, damagesource, f);
return true;
}
public void h() {
if (this.id.getMaterial() == Material.AIR) {
this.die();

1
Plugins/Nautilus.Core.CraftBukkit/src/net/minecraft/server/v1_7_R2/EntityHuman.java
View File

@ -900,6 +900,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
}
if (f > 0.0F || f1 > 0.0F) {
boolean flag = this.fallDistance > 0.0F && !this.onGround && !this.h_() && !this.L() && !this.hasEffect(MobEffectList.BLINDNESS) && this.vehicle == null && entity instanceof EntityLiving;
if (flag && f > 0.0F) {

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -514,7 +514,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
GetDisguise().undisguise(player);
}
public ArrayList<String> LoadFiles(String gameName)
public ArrayList<String> LoadFiles(String gameName)
{
File folder = new File(".." + File.separatorChar + ".." + File.separatorChar + "update" + File.separatorChar + "maps" + File.separatorChar + gameName);
if (!folder.exists()) folder.mkdirs();

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/GravityObject.java
View File

@ -52,8 +52,8 @@ public abstract class GravityObject
Base.setHealth(60);
Bat = new DisguiseBat(Base);
Bat.setSitting(false);
Host.Manager.GetDisguise().disguise(Bat);
Bat.setSitting(true);
//Host.Manager.GetDisguise().disguise(Bat);
UtilEnt.Vegetate(Base, true);
UtilEnt.ghost(Base, true, true);
@ -212,6 +212,6 @@ public abstract class GravityObject
public void SetMovingBat(boolean moving)
{
Bat.setSitting(!moving);
Host.Manager.GetDisguise().updateDisguise(Bat);
//Host.Manager.GetDisguise().updateDisguise(Bat);
}
}

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gravity/objects/GravityPlayer.java
View File

@ -104,12 +104,6 @@ public class GravityPlayer extends GravityObject
public void KickOff(Player player)
{
if (!Ent.equals(player))
return;
if (!Bat.isSitting() && !NearBlock())
return;
GrabDelay = System.currentTimeMillis();
AddVelocity(player.getLocation().getDirection().multiply(0.5), 0.5);

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java
View File

@ -456,6 +456,7 @@ public class HideSeek extends TeamGame
@EventHandler
public void FallingBlockDamage(EntityDamageEvent event)
{
System.out.println("Damage event.");
if (!(event instanceof EntityDamageByEntityEvent))
return;