Repo-Mirror/AkarinMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of github.com:Akarin-project/Paper

Browse Source
This commit is contained in:
Sotr
2019-03-07 12:44:05 +08:00
parent cf2d92ac5e 956e1fe461
commit 6f25bb7ea4
8 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraft/server/EntityBoat.java
View File

@@ -119,7 +119,7 @@ public class EntityBoat extends Entity {
this.world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return true;
return false;
}
// f = event.getDamage(); // TODO Why don't we do this?
// CraftBukkit end

2
src/main/java/net/minecraft/server/EntityLargeFireball.java
View File

@@ -26,7 +26,7 @@ public class EntityLargeFireball extends EntityFireball {
boolean flag = this.world.getGameRules().getBoolean("mobGriefing");
// CraftBukkit start - fire ExplosionPrimeEvent
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) org.bukkit.craftbukkit.entity.CraftEntity.getEntity(this.world.getServer(), this));
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
this.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {

2
src/main/java/net/minecraft/server/EntityLiving.java
View File

@@ -939,7 +939,7 @@ public abstract class EntityLiving extends Entity {
return false;
} else if (this.world.isClientSide) {
return false;
} else if (this.getHealth() <= 0.0F) {
} else if (this.dead || this.killed || this.getHealth() <= 0.0F) { // CraftBukkit - Don't allow entities that got set to dead/killed elsewhere to get damaged and die
return false;
} else if (damagesource.p() && this.hasEffect(MobEffects.FIRE_RESISTANCE)) {
return false;

2
src/main/java/net/minecraft/server/EntityMinecartAbstract.java
View File

@@ -118,7 +118,7 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
this.world.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return true;
return false;
}
f = (float) event.getDamage();

5
src/main/java/net/minecraft/server/EntityTNTPrimed.java
View File

@@ -93,9 +93,8 @@ public class EntityTNTPrimed extends Entity {
// CraftBukkit start
// float f = 4.0F;
org.bukkit.craftbukkit.CraftServer server = this.world.getServer();
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) org.bukkit.craftbukkit.entity.CraftEntity.getEntity(server, this));
server.getPluginManager().callEvent(event);
ExplosionPrimeEvent event = new ExplosionPrimeEvent((org.bukkit.entity.Explosive) this.getBukkitEntity());
this.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
this.world.createExplosion(this, this.locX, this.locY + (double) (this.length / 16.0F), this.locZ, event.getRadius(), event.getFire(), true);