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

55 lines
2.2 KiB
Diff
Raw Normal View History

Redo previous getCubes removal.
2013-12-21 23:05:27 +00:00
From c530ebb6e1c7bd61e041cfd3ecc5f40382603bcb 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
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
Merge in some stuff
2013-12-14 06:58:22 +00:00
index b308e03..f32322e 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
Merge in some stuff
2013-12-14 06:58:22 +00:00
@@ -176,7 +176,13 @@ public final class ItemStack {
Stage 1
2013-12-01 03:40:53 +00:00
return this.item.getMaxDurability();
Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
}
Fix isDamaged check for backwards compat
2013-03-16 00:57:39 +00:00
+ // Spigot start
public boolean isDamaged(int i, Random random) {
+ return isDamaged(i, random, null);
+ }
+
Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
+ public boolean isDamaged(int i, Random random, EntityLiving entityliving) {
Fix isDamaged check for backwards compat
2013-03-16 00:57:39 +00:00
+ // Spigot end
Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
if (!this.g()) {
return false;
} else {
Merge in some stuff
2013-12-14 06:58:22 +00:00
@@ -191,7 +197,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
}
}
Merge in some stuff
2013-12-14 06:58:22 +00:00
@@ -204,7 +219,7 @@ public final class ItemStack {
Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
public void damage(int i, EntityLiving entityliving) {
if (!(entityliving instanceof EntityHuman) || !((EntityHuman) entityliving).abilities.canInstantlyBuild) {
if (this.g()) {
Stage 1
2013-12-01 03:40:53 +00:00
- if (this.isDamaged(i, entityliving.aI())) {
+ if (this.isDamaged(i, entityliving.aI(), entityliving)) {
Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
entityliving.a(this);
Update to Minecraft 1.6.1 - Phase 1
2013-07-02 03:03:56 +00:00
--this.count;
Finish up the patches for 1.5. Now to test.
2013-03-15 22:08:53 +00:00
if (entityliving instanceof EntityHuman) {
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
--
Stage 1
2013-12-01 03:40:53 +00:00
1.8.3.2
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