twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 12:13:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Entity audit. Adds checks for null entities, and adds conformity.

Browse Source
This commit is contained in:
Andrew Ardill
2011-01-21 16:54:30 +11:00
parent 1dad7de4f3
commit 1cbde901ba
34 changed files with 211 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minecraft/server/EntityFish.java
View File

@@ -9,7 +9,7 @@ import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamageByProjectileEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
//CraftBukkit end
// CraftBukkit end
public class EntityFish extends Entity {
@@ -197,7 +197,7 @@ public class EntityFish extends Entity {
if (movingobjectposition != null) {
if (movingobjectposition.g != null) {
// CraftBukkit start
//TODO add EntityDamagedByProjectileEvent : fishing hook?
// TODO add EntityDamagedByProjectileEvent : fishing hook?
boolean bounce;
if (movingobjectposition.g instanceof EntityLiving) {
CraftServer server = ((WorldServer) this.l).getServer();
@@ -207,7 +207,7 @@ public class EntityFish extends Entity {
DamageCause damageCause = EntityDamageEvent.DamageCause.ENTITY_ATTACK;
int damage = 0;
//TODO @see EntityArrow#162
// TODO @see EntityArrow#162
EntityDamageByProjectileEvent edbpe = new EntityDamageByProjectileEvent(shooter, damagee, projectile, damageCause, damage);
server.getPluginManager().callEvent(edbpe);