geforkt von Mirrors/Paper
Silence BeaconEffectEvent, swallow exception in version checking
Dieser Commit ist enthalten in:
Ursprung
d83453116b
Commit
3a71da0bd3
@ -62,12 +62,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
- JSONObject obj = (JSONObject) new JSONParser().parse(reader);
|
- JSONObject obj = (JSONObject) new JSONParser().parse(reader);
|
||||||
- return ((Number) obj.get("totalCount")).intValue();
|
- return ((Number) obj.get("totalCount")).intValue();
|
||||||
- } catch (ParseException ex) {
|
- } catch (ParseException ex) {
|
||||||
|
- ex.printStackTrace();
|
||||||
+ // Paper start
|
+ // Paper start
|
||||||
+ int newVer = Integer.decode(reader.readLine());
|
+ int newVer = Integer.decode(reader.readLine());
|
||||||
+ int currentVer = Integer.decode(currentVerInt);
|
+ int currentVer = Integer.decode(currentVerInt);
|
||||||
+ return newVer - currentVer;
|
+ return newVer - currentVer;
|
||||||
+ } catch (NumberFormatException ex) {
|
+ } catch (NumberFormatException ex) {
|
||||||
ex.printStackTrace();
|
+ //ex.printStackTrace();
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
return -1;
|
return -1;
|
||||||
} finally {
|
} finally {
|
||||||
|
@ -0,0 +1,56 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
|
||||||
|
Date: Thu, 3 Mar 2016 04:45:26 -0600
|
||||||
|
Subject: [PATCH] Temp patch to nuke BeaconEffectEvent until we get some sleep
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
|
||||||
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
|
||||||
|
@@ -0,0 +0,0 @@ public class TileEntityBeacon extends TileEntityContainer implements ITickable,
|
||||||
|
|
||||||
|
// Paper start
|
||||||
|
org.bukkit.block.Block block = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
|
||||||
|
- PotionEffect primaryEffect = new PotionEffect(PotionEffectType.getByName(this.l.e), 180, b0, true, true);
|
||||||
|
+ // TODO: anytime other than 5 am
|
||||||
|
+ //PotionEffect primaryEffect = new PotionEffect(PotionEffectType.getById(MobEffectList.getId(this.l)), 180, b0, true, true);
|
||||||
|
// Paper end
|
||||||
|
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
entityhuman = (EntityHuman) iterator.next();
|
||||||
|
// Paper start - BeaconEffectEvent
|
||||||
|
- BeaconEffectEvent event = new BeaconEffectEvent(block, primaryEffect, (Player) entityhuman.getBukkitEntity(), true);
|
||||||
|
- if (CraftEventFactory.callEvent(event).isCancelled()) continue;
|
||||||
|
- PotionEffect effect = event.getEffect();
|
||||||
|
- entityhuman.addEffect(new MobEffect(MobEffectList.fromId(effect.getType().getId()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles()));
|
||||||
|
+ //BeaconEffectEvent event = new BeaconEffectEvent(block, primaryEffect, (Player) entityhuman.getBukkitEntity(), true);
|
||||||
|
+ //if (CraftEventFactory.callEvent(event).isCancelled()) continue;
|
||||||
|
+ //PotionEffect effect = event.getEffect();
|
||||||
|
+ //entityhuman.addEffect(new MobEffect(MobEffectList.fromId(effect.getType().getId()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles()));
|
||||||
|
+ entityhuman.addEffect(new MobEffect(this.l, i, b0, true, true));
|
||||||
|
// Paper end
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.k >= 4 && this.l != this.m && this.m != null) {
|
||||||
|
iterator = list.iterator();
|
||||||
|
- PotionEffect secondaryEffect = new PotionEffect(PotionEffectType.getByName(this.m.e), 180, 0, true, true); // Paper
|
||||||
|
+ // TODO: anytime other than 5 am
|
||||||
|
+ //PotionEffect primaryEffect = new PotionEffect(PotionEffectType.getById(MobEffectList.getId(this.m)), 180, b0, true, true);
|
||||||
|
|
||||||
|
while (iterator.hasNext()) {
|
||||||
|
entityhuman = (EntityHuman) iterator.next();
|
||||||
|
// Paper start - BeaconEffectEvent
|
||||||
|
- BeaconEffectEvent event = new BeaconEffectEvent(block, secondaryEffect, (Player) entityhuman.getBukkitEntity(), false);
|
||||||
|
- if (CraftEventFactory.callEvent(event).isCancelled()) continue;
|
||||||
|
- PotionEffect effect = event.getEffect();
|
||||||
|
- entityhuman.addEffect(new MobEffect(MobEffectList.fromId(effect.getType().getId()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles()));
|
||||||
|
+ //BeaconEffectEvent event = new BeaconEffectEvent(block, secondaryEffect, (Player) entityhuman.getBukkitEntity(), false);
|
||||||
|
+ //if (CraftEventFactory.callEvent(event).isCancelled()) continue;
|
||||||
|
+ //PotionEffect effect = event.getEffect();
|
||||||
|
+ //entityhuman.addEffect(new MobEffect(MobEffectList.fromId(effect.getType().getId()), effect.getDuration(), effect.getAmplifier(), effect.isAmbient(), effect.hasParticles()));
|
||||||
|
+ entityhuman.addEffect(new MobEffect(this.m, i, 0, true, true));
|
||||||
|
// Paper end
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren