core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/CraftBukkit-Patches/0092-Cancellable-WitherSkul...

41 lines
2.0 KiB
Diff
Raw Normal View History

Update to Minecraft 1.8.8 (Pre-)Release.
2015-07-27 12:20:54 +00:00
From b83fad21f16c150a9559b077d160e143f491c0e1 Mon Sep 17 00:00:00 2001
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
From: drXor <mcyoungsota@gmail.com>
Date: Tue, 25 Feb 2014 15:15:26 -0400
Subject: [PATCH] Cancellable WitherSkull potion effect
diff --git a/src/main/java/net/minecraft/server/EntityWitherSkull.java b/src/main/java/net/minecraft/server/EntityWitherSkull.java
Update to Minecraft 1.8.3
2015-02-28 11:36:22 +00:00
index e169184..f0e627b 100644
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
--- a/src/main/java/net/minecraft/server/EntityWitherSkull.java
+++ b/src/main/java/net/minecraft/server/EntityWitherSkull.java
Update to Minecraft 1.8.3
2015-02-28 11:36:22 +00:00
@@ -36,8 +36,11 @@ public class EntityWitherSkull extends EntityFireball {
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
protected void a(MovingObjectPosition movingobjectposition) {
Update to Minecraft 1.8.3
2015-02-28 11:36:22 +00:00
if (!this.world.isClientSide) {
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
if (movingobjectposition.entity != null) {
+ // Spigot start
Fix merge conflicts.
2015-01-24 23:37:00 +00:00
+ boolean didDamage = false;
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
if (this.shooter != null) {
Fix merge conflicts.
2015-01-24 23:37:00 +00:00
- if (movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F)) { // CraftBukkit
+ didDamage = movingobjectposition.entity.damageEntity(DamageSource.projectile(this, shooter), 8.0F);
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
+ if (didDamage) {
if (!movingobjectposition.entity.isAlive()) {
this.shooter.heal(5.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.WITHER); // CraftBukkit
} else {
Update to Minecraft 1.8.3
2015-02-28 11:36:22 +00:00
@@ -45,10 +48,11 @@ public class EntityWitherSkull extends EntityFireball {
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
}
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
}
} else {
- movingobjectposition.entity.damageEntity(DamageSource.MAGIC, 5.0F);
+ didDamage = movingobjectposition.entity.damageEntity(DamageSource.MAGIC, 5.0F);
}
- if (movingobjectposition.entity instanceof EntityLiving) {
+ if (didDamage && movingobjectposition.entity instanceof EntityLiving) {
+ // Spigot end
byte b0 = 0;
Update PaperSpigot to Minecraft 1.8
2014-11-28 01:17:45 +00:00
if (this.world.getDifficulty() == EnumDifficulty.NORMAL) {
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00
--
Update to 1.8.4
2015-05-09 20:23:26 +00:00
2.1.4
Restructure PaperSpigot as a new set of modules Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
2014-07-21 20:46:54 +00:00