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

Update B/CB

Browse Source
This commit is contained in:
Shane Freeder
2017-11-24 07:14:38 +00:00
parent 6c5d4f75ee
commit 1912d06613
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Spigot-Server-Patches/0171-Add-source-to-PlayerExpChangeEvent.patch
View File

@@ -1,15 +1,15 @@
From b9cf0c402f2c29fa10934108747fc075759462eb Mon Sep 17 00:00:00 2001
From 1a2f8fc03d482c57b6a4d9ca1c83de647a15d472 Mon Sep 17 00:00:00 2001
From: AlphaBlend <whizkid3000@hotmail.com>
Date: Thu, 8 Sep 2016 08:48:33 -0700
Subject: [PATCH] Add source to PlayerExpChangeEvent
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index b200bbf64..ec23eb98c 100644
index eae706368..bf5f1f0e8 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -172,7 +172,7 @@ public class EntityExperienceOrb extends Entity {
}
@@ -178,7 +178,7 @@ public class EntityExperienceOrb extends Entity {
}
if (this.value > 0) {
- entityhuman.giveExp(CraftEventFactory.callPlayerExpChangeEvent(entityhuman, this.value).getAmount()); // CraftBukkit - this.value -> event.getAmount()
@@ -18,10 +18,10 @@ index b200bbf64..ec23eb98c 100644
this.die();
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index bdeeac36f..7422a91f0 100644
index ba7e5d181..87b4e9189 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -45,6 +45,7 @@ import org.bukkit.entity.Player;
@@ -46,6 +46,7 @@ import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.entity.ThrownExpBottle;
import org.bukkit.entity.ThrownPotion;
@@ -29,7 +29,7 @@ index bdeeac36f..7422a91f0 100644
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.block.*;
@@ -647,6 +648,17 @@ public class CraftEventFactory {
@@ -656,6 +657,17 @@ public class CraftEventFactory {
return event;
}
@@ -48,5 +48,5 @@ index bdeeac36f..7422a91f0 100644
Block block = world.getWorld().getBlockAt(x, y, z);
CraftBlockState state = (CraftBlockState) block.getState();
--
2.14.2
2.15.0