Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improved parachute deployment code.

Browse source
This commit is contained in:
bconlon 2020-07-11 14:57:43 -07:00
parent b4d97e9011
commit 384b0085b2
2 changed files with 38 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/main/java/com/legacy/aether/player/PlayerAether.java
View file

@ -282,33 +282,48 @@ public class PlayerAether implements IPlayerAether {
{
EntityParachute parachute = null;
if(this.getEntity().inventory.hasItemStack(new ItemStack(ItemsAether.cloud_parachute)))
ItemStack itemstack = null;
for (int i = 0; i < this.getEntity().inventory.getSizeInventory(); i++)
{
ItemStack stackInSlot = this.getEntity().inventory.getStackInSlot(i);
if(stackInSlot != null && stackInSlot.getItem() == ItemsAether.cloud_parachute)
{
itemstack = stackInSlot;
break;
}
else
{
if (stackInSlot != null && stackInSlot.getItem() == ItemsAether.golden_parachute)
{
itemstack = stackInSlot;
break;
}
}
}
if (itemstack != null)
{
if (itemstack.getItem() == ItemsAether.cloud_parachute)
{
parachute = new EntityParachute(this.getEntity().worldObj, this.getEntity(), false);
parachute.setPosition(this.getEntity().posX, this.getEntity().posY, this.getEntity().posZ);
this.getEntity().worldObj.spawnEntityInWorld(parachute);
this.getEntity().inventory.consumeInventoryItem(ItemsAether.cloud_parachute);
this.getEntity().inventory.consumeInventoryItem(itemstack.getItem());
}
else
{
if (this.getEntity().inventory.hasItemStack(new ItemStack(ItemsAether.golden_parachute)))
{
for(int i = 0; i < this.getEntity().inventory.getSizeInventory(); i++)
{
ItemStack itemstack = this.getEntity().inventory.getStackInSlot(i);
if(itemstack != null && itemstack.getItem() == ItemsAether.golden_parachute)
if (itemstack.getItem() == ItemsAether.golden_parachute)
{
itemstack.damageItem(1, this.getEntity());
parachute = new EntityParachute(this.getEntity().worldObj, this.getEntity(), true);
parachute.setPosition(this.getEntity().posX, this.getEntity().posY, this.getEntity().posZ);
this.getEntity().inventory.setInventorySlotContents(i, itemstack);
this.getEntity().worldObj.spawnEntityInWorld(parachute);
}
}
}
}
}
public boolean isInsideBlock(Block block) {
AxisAlignedBB boundingBox = this.getEntity().boundingBox;

1
src/main/java/com/legacy/aether/player/perks/AetherRankings.java
View file

@ -18,6 +18,7 @@ public class AetherRankings {
addGGRank("58a5d694-a8a6-4605-ab33-d6904107ad5f"); // bconlon
addGGRank("353a859b-ba16-4e6a-8f63-9a8c79ab0071"); // quek_guy
addGGRank("c3e6871e-8e60-490a-8a8d-2bbe35ad1604"); // Raptor__
addGGRank("d475af59-d73c-42be-90ed-f1a78f10d452"); // bumble_dani
addGGRank("78c7f290-62aa-4afa-9d9a-f8e6b2f85206"); // NAPPUS
//Retired Gilded Games