OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-06 10:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflicts.

Browse source
This commit is contained in:
md_5 2015-01-25 10:37:00 +11:00
parent a0fb646609
commit 0affb6adab
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch
View file

@ -192,5 +192,3 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Spigot end + // Spigot end
} }
-- --
1.9.5.msysgit.0

2
CraftBukkit-Patches/0026-Implement-SpawnerSpawnEvent.patch
View file

@ -50,7 +50,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
@@ -0,0 +0,0 @@ public abstract class MobSpawnerAbstract { @@ -0,0 +0,0 @@ public abstract class MobSpawnerAbstract {
} }
} else if (entity instanceof EntityLiving && entity.world != null && flag) { } else if (entity instanceof EntityInsentient && entity.world != null && flag) { // CraftBukkit - EntityLiving -> EntityInsentient
((EntityInsentient) entity).prepare(entity.world.E(new BlockPosition(entity)), (GroupDataEntity) null); ((EntityInsentient) entity).prepare(entity.world.E(new BlockPosition(entity)), (GroupDataEntity) null);
- entity.world.addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit - entity.world.addEntity(entity, CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit
+ // Spigot start - call SpawnerSpawnEvent, abort if cancelled + // Spigot start - call SpawnerSpawnEvent, abort if cancelled

4
CraftBukkit-Patches/0094-Cancellable-WitherSkull-potion-effect.patch
View file

@ -15,8 +15,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ // Spigot start + // Spigot start
+ boolean didDamage = false; + boolean didDamage = false;
if (this.shooter != null) { if (this.shooter != null) {
- if (movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F)) { - if (movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F)) { // CraftBukkit
+ didDamage = movingobjectposition.entity.damageEntity(DamageSource.mobAttack(this.shooter), 8.0F); + didDamage = movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F);
+ if (didDamage) { + if (didDamage) {
if (!movingobjectposition.entity.isAlive()) { if (!movingobjectposition.entity.isAlive()) {
this.shooter.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit this.shooter.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit