This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java | |
index 3e03aee98..5ef1b283a 100644 | |
--- a/src/main/java/net/minecraft/server/Chunk.java | |
+++ b/src/main/java/net/minecraft/server/Chunk.java | |
@@ -704,6 +704,7 @@ public class Chunk { | |
// Spigot end | |
} | |
+ public void removeEntity(Entity entity) { b(entity); } // Paper - OBFHELPER | |
public void b(Entity entity) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ TYRIAL ] ✔ [ 09:08 PM ] -- [ aikar ] -- [ master ] - (6#,24+,1-) -- [ ~/ssd-projects/emc/EMC-Plugins ] | |
>>> cloc Empire/src/ | |
517 text files. | |
517 unique files. | |
1 file ignored. | |
http://cloc.sourceforge.net v 1.60 T=1.50 s (344.9 files/s, 57340.0 lines/s) | |
------------------------------------------------------------------------------- | |
Language files blank comment code | |
------------------------------------------------------------------------------- |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From c454abf206e9b578128175fbc33ac3b58eae77a9 Mon Sep 17 00:00:00 2001 | |
From: Aikar <[email protected]> | |
Date: Sat, 16 Jun 2018 13:41:00 -0400 | |
Subject: [PATCH] Add SentientNPC Interface to Entities | |
Used to determine ACTUAL Living NPC's. Spigot mistakenly inversed the conditions for LivingEntity, and | |
used LivingEntity for Insentient Entities, and named the actual EntityLiving class EntityInsentient. | |
This should of all been inversed on the implementation side. To make matters worse, Spigot never | |
exposed the differentiator that there are entities with AI that are not sentient/alive such as |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 3304291bf9ebdc12525fc47e2e45d154fc0f01d7 Mon Sep 17 00:00:00 2001 | |
From: Aikar <[email protected]> | |
Date: Sat, 16 Jun 2018 13:41:00 -0400 | |
Subject: [PATCH] Add NPC Interface to Entities | |
Used to determine ACTUAL Living NPC's. Spigot mistakenly inversed the conditions for LivingEntity, and | |
used LivingEntity for Insentient Entities, and named the actual EntityLiving class EntityInsentient. | |
This should of all been inversed on the implementation side. To make matters worse, Spigot never | |
exposed the differentiator that there are entities with AI that are not sentient/alive such as |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
static Runnable of(String name, Runnable run) { | |
return () -> { | |
try (Timing ignored = Util.timings(name).startTimingIfSync()) { | |
run.run(); | |
} | |
}; | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/* | |
* Copyright (c) 2016. Starlis LLC / dba Empire Minecraft | |
* | |
* This source code is proprietary software and must not be redistributed without Starlis LLC's approval | |
* | |
*/ | |
package com.empireminecraft.util; | |
import co.aikar.timings.Timing; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Empire/src/main/java/com/empireminecraft/commands/features/GroupCommand.java b/Empire/src/main/java/com/empireminecraft/commands/features/GroupCommand.java | |
index 4c19edc2d..b0454a5ce 100644 | |
--- a/Empire/src/main/java/com/empireminecraft/commands/features/GroupCommand.java | |
+++ b/Empire/src/main/java/com/empireminecraft/commands/features/GroupCommand.java | |
@@ -46,8 +46,20 @@ public class GroupCommand extends EmpireBaseCommand { | |
@Subcommand("join|j") | |
@CommandAlias("join") | |
- public void onJoin(Player player) { | |
- Groups.acceptInvite(player); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
// ==UserScript== | |
// @name Sheetz Calories | |
// @namespace http://tampermonkey.net/ | |
// @version 0.1 | |
// @description Calculates Total Calories on sheetz.com Made to Order page | |
// @author Daniel Ennis / Aikar ([email protected]) | |
// @match https://orderz.sheetz.com/ | |
// @grant none | |
// ==/UserScript== |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
@EventHandler | |
public void onSwitch(final ServerConnectEvent event) { | |
final ProxiedPlayer player = event.getPlayer(); | |
final ServerConnection server = (ServerConnection) player.getServer(); | |
final UserConnection con = (UserConnection) player; | |
if (server == null) { | |
return; | |
} |