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

Made some of the inebriation packet code a bit more solid, hopefully prevents any issues with it.

This commit is contained in:
bconlon 2020-12-28 19:04:25 -08:00
parent 9703daf541
commit 3178485ce0
3 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/gildedgames/the_aether/entities/effects/PotionInebriation.java
View File

@ -3,6 +3,7 @@ package com.gildedgames.the_aether.entities.effects;
import com.gildedgames.the_aether.Aether;
import com.gildedgames.the_aether.AetherConfig;
import com.gildedgames.the_aether.api.AetherAPI;
import com.gildedgames.the_aether.api.player.IPlayerAether;
import com.gildedgames.the_aether.network.AetherNetwork;
import com.gildedgames.the_aether.network.packets.PacketSendPoison;
import com.gildedgames.the_aether.player.PlayerAether;
@ -56,8 +57,19 @@ public class PotionInebriation extends Potion
{
if (this.duration >= 500)
{
((PlayerAether) AetherAPI.get((EntityPlayer) entityLivingBaseIn)).setPoisoned();
AetherNetwork.sendToAll(new PacketSendPoison((EntityPlayer) entityLivingBaseIn));
EntityPlayer player = (EntityPlayer) entityLivingBaseIn;
IPlayerAether iPlayerAether = AetherAPI.get(player);
if (iPlayerAether != null)
{
PlayerAether playerAether = (PlayerAether) iPlayerAether;
if (!player.worldObj.isRemote)
{
playerAether.setPoisoned();
AetherNetwork.sendToAll(new PacketSendPoison(player));
}
}
}
}
}

17
src/main/java/com/gildedgames/the_aether/network/packets/PacketSendPoison.java
View File

@ -1,8 +1,10 @@
package com.gildedgames.the_aether.network.packets;
import com.gildedgames.the_aether.api.AetherAPI;
import com.gildedgames.the_aether.api.player.IPlayerAether;
import com.gildedgames.the_aether.player.PlayerAether;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
public class PacketSendPoison extends AetherPacket<PacketSendPoison> {
@ -36,11 +38,20 @@ public class PacketSendPoison extends AetherPacket<PacketSendPoison> {
{
if (player != null && player.worldObj != null)
{
EntityPlayer parent = (EntityPlayer) player.worldObj.getEntityByID(message.entityID);
Entity entity = player.worldObj.getEntityByID(message.entityID);
if (parent != null)
if (entity instanceof EntityPlayer)
{
((PlayerAether) AetherAPI.get(parent)).setPoisoned();
EntityPlayer parent = (EntityPlayer) entity;
IPlayerAether iPlayerAether = AetherAPI.get(parent);
if (iPlayerAether != null)
{
PlayerAether playerAether = (PlayerAether) iPlayerAether;
playerAether.setPoisoned();
}
}
}
}

17
src/main/java/com/gildedgames/the_aether/network/packets/PacketSendPoisonTime.java
View File

@ -1,8 +1,10 @@
package com.gildedgames.the_aether.network.packets;
import com.gildedgames.the_aether.api.AetherAPI;
import com.gildedgames.the_aether.api.player.IPlayerAether;
import com.gildedgames.the_aether.player.PlayerAether;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
public class PacketSendPoisonTime extends AetherPacket<PacketSendPoisonTime>
@ -40,11 +42,20 @@ public class PacketSendPoisonTime extends AetherPacket<PacketSendPoisonTime>
{
if (player != null && player.worldObj != null)
{
EntityPlayer parent = (EntityPlayer) player.worldObj.getEntityByID(message.entityID);
Entity entity = player.worldObj.getEntityByID(message.entityID);
if (parent != null)
if (entity instanceof EntityPlayer)
{
((PlayerAether) AetherAPI.get(parent)).poisonTime = message.time;
EntityPlayer parent = (EntityPlayer) entity;
IPlayerAether iPlayerAether = AetherAPI.get(parent);
if (iPlayerAether != null)
{
PlayerAether playerAether = (PlayerAether) iPlayerAether;
playerAether.poisonTime = message.time;
}
}
}
}