SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-07-15 10:00:00 +10:00
parent d1e91a8adb
commit 7e0a66fdd5
608 changed files with 17788 additions and 9378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
paper-server/nms-patches/PathfinderGoalEatTile.patch
View File

@@ -1,34 +1,33 @@
--- a/net/minecraft/server/PathfinderGoalEatTile.java
+++ b/net/minecraft/server/PathfinderGoalEatTile.java
@@ -3,6 +3,11 @@
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -2,6 +2,10 @@
import java.util.function.Predicate;
+// CraftBukkit start
+import org.bukkit.craftbukkit.event.CraftEventFactory;
+import org.bukkit.Material;
+// CraftBukkit end
+
public class PathfinderGoalEatTile extends PathfinderGoal {
private static final Predicate<IBlockData> b = BlockStatePredicate.a((Block) Blocks.TALLGRASS).a(BlockLongGrass.TYPE, Predicates.equalTo(BlockLongGrass.EnumTallGrassType.GRASS));
@@ -50,7 +55,8 @@
BlockPosition blockposition = new BlockPosition(this.c.locX, this.c.locY, this.c.locZ);
private static final Predicate<IBlockData> a = BlockStatePredicate.a(Blocks.GRASS);
@@ -49,7 +53,8 @@
BlockPosition blockposition = new BlockPosition(this.b.locX, this.b.locY, this.b.locZ);
if (PathfinderGoalEatTile.b.apply(this.d.getType(blockposition))) {
- if (this.d.getGameRules().getBoolean("mobGriefing")) {
if (PathfinderGoalEatTile.a.test(this.c.getType(blockposition))) {
- if (this.c.getGameRules().getBoolean("mobGriefing")) {
+ // CraftBukkit
+ if (!CraftEventFactory.callEntityChangeBlockEvent(this.c, this.c.world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), Material.AIR, !this.d.getGameRules().getBoolean("mobGriefing")).isCancelled()) {
this.d.setAir(blockposition, false);
+ if (!CraftEventFactory.callEntityChangeBlockEvent(this.b, blockposition, Blocks.AIR.getBlockData(), !this.c.getGameRules().getBoolean("mobGriefing")).isCancelled()) {
this.c.setAir(blockposition, false);
}
@@ -59,7 +65,8 @@
@@ -58,7 +63,8 @@
BlockPosition blockposition1 = blockposition.down();
if (this.d.getType(blockposition1).getBlock() == Blocks.GRASS) {
- if (this.d.getGameRules().getBoolean("mobGriefing")) {
if (this.c.getType(blockposition1).getBlock() == Blocks.GRASS_BLOCK) {
- if (this.c.getGameRules().getBoolean("mobGriefing")) {
+ // CraftBukkit
+ if (!CraftEventFactory.callEntityChangeBlockEvent(this.c, this.c.world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), Material.AIR, !this.d.getGameRules().getBoolean("mobGriefing")).isCancelled()) {
this.d.triggerEffect(2001, blockposition1, Block.getId(Blocks.GRASS));
this.d.setTypeAndData(blockposition1, Blocks.DIRT.getBlockData(), 2);
+ if (!CraftEventFactory.callEntityChangeBlockEvent(this.b, blockposition, Blocks.AIR.getBlockData(), !this.c.getGameRules().getBoolean("mobGriefing")).isCancelled()) {
this.c.triggerEffect(2001, blockposition1, Block.getCombinedId(Blocks.GRASS_BLOCK.getBlockData()));
this.c.setTypeAndData(blockposition1, Blocks.DIRT.getBlockData(), 2);
}