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

Fix compilation

Browse Source
This commit is contained in:
Shane Freeder
2019-05-22 05:14:56 +01:00
parent 08aaab0105
commit d9ad4e8bd8
39 changed files with 207 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Spigot-Server-Patches/0247-InventoryCloseEvent-Reason-API.patch
View File

@@ -1,4 +1,4 @@
From f49837ffa30f83b202f8586e3ba022e4d7f9b29b Mon Sep 17 00:00:00 2001
From 1b3618da7548f0296c4f8d84bab2dd7344673248 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 3 Jul 2018 21:56:23 -0400
Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
to "confirm" things based on if it was player triggered close or not.
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index f5dac5082..d1a7a873b 100644
index f5dac50826..d1a7a873b9 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -149,7 +149,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,7 +34,7 @@ index f5dac5082..d1a7a873b 100644
this.activeContainer = this.defaultContainer;
}
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 29ebee2d9..d46ddba34 100644
index c3026530d2..0a575456a1 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -360,7 +360,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,7 +88,7 @@ index 29ebee2d9..d46ddba34 100644
this.m();
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 8be09b1d0..0385eced6 100644
index 8be09b1d03..0385eced64 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2050,7 +2050,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -101,7 +101,7 @@ index 8be09b1d0..0385eced6 100644
this.player.m();
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 5ac4a7c28..006f7b8b9 100644
index 5ac4a7c284..006f7b8b9f 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -402,7 +402,7 @@ public abstract class PlayerList {
@@ -114,7 +114,7 @@ index 5ac4a7c28..006f7b8b9 100644
PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
cserver.getPluginManager().callEvent(playerQuitEvent);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8bc0a8cca..067379252 100644
index 8bc0a8cca8..067379252d 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -981,7 +981,7 @@ public class WorldServer extends World {
@@ -136,10 +136,10 @@ index 8bc0a8cca..067379252 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index d0a019f50..79fc638a0 100644
index 60f839056b..948eef8689 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -607,8 +607,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -614,8 +614,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@Override
public void closeInventory() {
@@ -155,7 +155,7 @@ index d0a019f50..79fc638a0 100644
@Override
public boolean isBlocking() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index be7c5d174..ba60ece45 100644
index be7c5d1747..ba60ece457 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -771,7 +771,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index be7c5d174..ba60ece45 100644
// Check if the fromWorld and toWorld are the same.
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index ef62edec4..dc83a90a4 100644
index ef62edec48..dc83a90a4d 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1241,8 +1241,19 @@ public class CraftEventFactory {