core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/CraftBukkit-Patches/0038-PlayerItemDamageEvent....

53 lines
2.3 KiB
Diff
Raw Normal View History

Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
From cc1b0248bbf67e99b0862ae7ebbdd1415a288d04 Mon Sep 17 00:00:00 2001
Implement PlayerItemDamageEvent. @Sleaker @Kainzo - if you could kindly tell me why you add code to prevent Heroes from running on a **now supported** platform, I would love to know, maybe we can resolve this once and for all. Unless of course it is simply part of your plan to make people use your rise against CraftBukkit fork with only 1 tiny feature which can and will be replicated in a plugin if need be.
2013-03-04 07:49:59 +00:00
From: md_5 <md_5@live.com.au>
Date: Mon, 4 Mar 2013 18:45:52 +1100
Subject: [PATCH] PlayerItemDamageEvent
---
Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
src/main/java/net/minecraft/server/ItemStack.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
Implement PlayerItemDamageEvent. @Sleaker @Kainzo - if you could kindly tell me why you add code to prevent Heroes from running on a **now supported** platform, I would love to know, maybe we can resolve this once and for all. Unless of course it is simply part of your plan to make people use your rise against CraftBukkit fork with only 1 tiny feature which can and will be replicated in a plugin if need be.
2013-03-04 07:49:59 +00:00
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
index cd6dd07..b8c845e 100644
Implement PlayerItemDamageEvent. @Sleaker @Kainzo - if you could kindly tell me why you add code to prevent Heroes from running on a **now supported** platform, I would love to know, maybe we can resolve this once and for all. Unless of course it is simply part of your plan to make people use your rise against CraftBukkit fork with only 1 tiny feature which can and will be replicated in a plugin if need be.
2013-03-04 07:49:59 +00:00
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
@@ -159,7 +159,7 @@ public final class ItemStack {
return Item.byId[this.id].getMaxDurability();
}
- public boolean isDamaged(int i, Random random) {
+ public boolean isDamaged(int i, Random random, EntityLiving entityliving) {
if (!this.g()) {
return false;
} else {
Phase 1 of MC 1.5 update. No this is not meant to compile, don't get your hopes up :p
2013-03-15 21:35:56 +00:00
@@ -174,7 +174,16 @@ public final class ItemStack {
Implement PlayerItemDamageEvent. @Sleaker @Kainzo - if you could kindly tell me why you add code to prevent Heroes from running on a **now supported** platform, I would love to know, maybe we can resolve this once and for all. Unless of course it is simply part of your plan to make people use your rise against CraftBukkit fork with only 1 tiny feature which can and will be replicated in a plugin if need be.
2013-03-04 07:49:59 +00:00
}
i -= k;
- if (i <= 0) {
+ // Spigot start
+ if (entityliving instanceof EntityPlayer) {
+ org.bukkit.craftbukkit.inventory.CraftItemStack item = org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(this);
Quick fix damage event
2013-03-04 20:22:03 +00:00
+ org.bukkit.event.player.PlayerItemDamageEvent event = new org.bukkit.event.player.PlayerItemDamageEvent((org.bukkit.entity.Player) entityliving.getBukkitEntity(), item, i);
Implement PlayerItemDamageEvent. @Sleaker @Kainzo - if you could kindly tell me why you add code to prevent Heroes from running on a **now supported** platform, I would love to know, maybe we can resolve this once and for all. Unless of course it is simply part of your plan to make people use your rise against CraftBukkit fork with only 1 tiny feature which can and will be replicated in a plugin if need be.
2013-03-04 07:49:59 +00:00
+ org.bukkit.Bukkit.getServer().getPluginManager().callEvent(event);
Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
+ if (event.isCancelled()) return false;
Implement PlayerItemDamageEvent. @Sleaker @Kainzo - if you could kindly tell me why you add code to prevent Heroes from running on a **now supported** platform, I would love to know, maybe we can resolve this once and for all. Unless of course it is simply part of your plan to make people use your rise against CraftBukkit fork with only 1 tiny feature which can and will be replicated in a plugin if need be.
2013-03-04 07:49:59 +00:00
+ i = event.getDamage();
+ }
+ // Spigot end
+ if (i <= 0 ) {
Phase 1 of MC 1.5 update. No this is not meant to compile, don't get your hopes up :p
2013-03-15 21:35:56 +00:00
return false;
Implement PlayerItemDamageEvent. @Sleaker @Kainzo - if you could kindly tell me why you add code to prevent Heroes from running on a **now supported** platform, I would love to know, maybe we can resolve this once and for all. Unless of course it is simply part of your plan to make people use your rise against CraftBukkit fork with only 1 tiny feature which can and will be replicated in a plugin if need be.
2013-03-04 07:49:59 +00:00
}
}
Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
@@ -187,7 +196,7 @@ public final class ItemStack {
public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
if (this.g()) {
- if (this.isDamaged(i, entityliving.aE())) {
+ if (this.isDamaged(i, entityliving.aE(), entityliving)) {
entityliving.a(this);
if (entityliving instanceof EntityHuman) {
((EntityHuman) entityliving).a(StatisticList.F[this.id], 1);
Implement PlayerItemDamageEvent. @Sleaker @Kainzo - if you could kindly tell me why you add code to prevent Heroes from running on a **now supported** platform, I would love to know, maybe we can resolve this once and for all. Unless of course it is simply part of your plan to make people use your rise against CraftBukkit fork with only 1 tiny feature which can and will be replicated in a plugin if need be.
2013-03-04 07:49:59 +00:00
--
1.8.1-rc2